Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[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>

authored by

Takashi Iwai and committed by
Jaroslav Kysela
c2902c8a 48ec15dc

+2 -2
+1 -1
include/sound/core.h
··· 242 242 { 243 243 return snd_register_device_for_dev(type, card, dev, f_ops, 244 244 private_data, name, 245 - card ? card->dev : NULL); 245 + snd_card_get_device_link(card)); 246 246 } 247 247 248 248 int snd_unregister_device(int type, struct snd_card *card, int dev);
+1 -1
sound/core/pcm.c
··· 968 968 * if possible */ 969 969 dev = pcm->dev; 970 970 if (!dev) 971 - dev = pcm->card ? pcm->card->dev : NULL; 971 + dev = snd_card_get_device_link(pcm->card); 972 972 /* register pcm */ 973 973 err = snd_register_device_for_dev(devtype, pcm->card, 974 974 pcm->device,