diff options
| author | Takashi Iwai <tiwai@suse.de> | 2007-02-09 16:25:48 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 16:25:48 +0100 |
| commit | c2902c8ae06762d941fab64198467f78cab6f8cd (patch) | |
| tree | b960df23be1ae9798cf6f306264d34f153f88654 | |
| parent | [ALSA] version 1.0.14rc2 (diff) | |
| download | linux-c2902c8ae06762d941fab64198467f78cab6f8cd.tar.xz linux-c2902c8ae06762d941fab64198467f78cab6f8cd.zip | |
[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>
| -rw-r--r-- | include/sound/core.h | 2 | ||||
| -rw-r--r-- | 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 3c493ad620d1..4b9e609975ab 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 76fcc5234d83..2743414fc8fa 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, |