Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c2902c8a authored Feb 09, 2007 by Takashi Iwai Committed by Jaroslav Kysela Feb 09, 2007

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

parent 48ec15dc

include/sound/core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

sound/core/pcm.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,