summaryrefslogtreecommitdiffstats
path: root/sound/core
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2007-02-09 16:25:48 +0100
committerJaroslav Kysela <perex@suse.cz>2007-02-09 16:25:48 +0100
commitc2902c8ae06762d941fab64198467f78cab6f8cd (patch)
treeb960df23be1ae9798cf6f306264d34f153f88654 /sound/core
parent48ec15dca87805cf771855612d647bfe1a9f617f (diff)
downloadop-kernel-dev-c2902c8ae06762d941fab64198467f78cab6f8cd.zip
op-kernel-dev-c2902c8ae06762d941fab64198467f78cab6f8cd.tar.gz
[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>
Diffstat (limited to 'sound/core')
-rw-r--r--sound/core/pcm.c2
1 files changed, 1 insertions, 1 deletions
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 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,
OpenPOWER on IntegriCloud