From: Takashi Iwai Date: Fri, 9 Feb 2007 15:25:48 +0000 (+0100) Subject: [PATCH] Fix breakage with CONFIG_SYSFS_DEPRECATED X-Git-Tag: v2.6.21-rc1~83^2~62^2 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c2902c8ae06762d941fab64198467f78cab6f8cd;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Jaroslav Kysela --- diff --git a/include/sound/core.h b/include/sound/core.h index 3c493ad620d..4b9e609975a 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -242,7 +242,7 @@ static inline int snd_register_device(int type, struct snd_card *card, int dev, { 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 76fcc5234d8..2743414fc8f 100644 --- a/sound/core/pcm.c +++ b/sound/core/pcm.c @@ -968,7 +968,7 @@ static int snd_pcm_dev_register(struct snd_device *device) * 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,