Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946499AbXBIPAq (ORCPT ); Fri, 9 Feb 2007 10:00:46 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1946497AbXBIPAq (ORCPT ); Fri, 9 Feb 2007 10:00:46 -0500 Received: from ns.suse.de ([195.135.220.2]:37980 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1946499AbXBIPAp (ORCPT ); Fri, 9 Feb 2007 10:00:45 -0500 Date: Fri, 09 Feb 2007 16:00:44 +0100 Message-ID: From: Takashi Iwai To: Jaroslav Kysela Cc: Linus Torvalds , LKML , Andrew Morton Subject: Re: [ALSA PATCH] alsa-git merge request In-Reply-To: References: User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta27) (fiddleheads) (+CVS-20060704) (i386-suse-linux) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2378 Lines: 79 At Fri, 09 Feb 2007 15:47:30 +0100, I wrote: > > At Fri, 9 Feb 2007 15:40:21 +0100 (CET), > Jaroslav Kysela wrote: > > > > On Fri, 9 Feb 2007, Takashi Iwai wrote: > > > > > At Fri, 9 Feb 2007 15:02:05 +0100 (CET), > > > Jaroslav Kysela wrote: > > > > > > > > Linus, please do an update from: > > > > > > > > http://www.kernel.org/pub/scm/linux/kernel/git/perex/alsa.git > > > > (linus branch) > > > > > > Jaroslav, as I wrote you many times, this tree includes the wrong > > > patches! If it's merged, we'd need fix patches in addition > > > eventually... > > > > I replaced patches with your code a few days ago. If something else is > > broken, please, let me know. > > Strange, my local tree freshly pulled have old files. > I'll try to pull cleanly and check again. Reconfirmed that it's still broken. The below is a patch to fix. Please apply. thanks, Takashi === [PATCH] Fix breakage with CONFIG_SYSFS_DEPRECATED The fix for sysfs breakage with CONFIG_SYSFS_DEPRECATED was flown away by the conflicted merge of the ALSA git tree. The patch below fixes it again. Signed-off-by: Takashi Iwai --- include/sound/core.h | 2 +- sound/core/pcm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/sound/core.h b/include/sound/core.h index 3c493ad..4b9e609 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -242,7 +242,7 @@ static inline int snd_register_device(in { return snd_register_device_for_dev(type, card, dev, f_ops, private_data, name, - card ? card->dev : NULL); + snd_card_get_device_link(card)); } int snd_unregister_device(int type, struct snd_card *card, int dev); diff --git a/sound/core/pcm.c b/sound/core/pcm.c index 76fcc52..2743414 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -968,7 +968,7 @@ static int snd_pcm_dev_register(struct s * if possible */ dev = pcm->dev; if (!dev) - dev = pcm->card ? pcm->card->dev : NULL; + dev = snd_card_get_device_link(pcm->card); /* register pcm */ err = snd_register_device_for_dev(devtype, pcm->card, pcm->device, - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/