[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 <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
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 @@
{
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 @@
* 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,