leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Fix breakage with CONFIG_SYSFS_DEPRECATED

Browse Source 
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>
This commit is contained in:
Takashi Iwai 2007-02-09 16:25:48 +01:00 committed by Jaroslav Kysela
parent 48ec15dca8
commit c2902c8ae0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/sound/core.h
View File

@ -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);

2
sound/core/pcm.c
View File

@ -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,