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

[ALSA] aoa: set device pointer in pcms

This patch makes a few whitespace cleanups and makes i2sbus assign the new
struct device pointer in struct snd_pcm so that the proper device symlink
shows up in sysfs.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

authored by

Johannes Berg and committed by
Jaroslav Kysela
73e85fe8 c78085fc

+3 -6
+1 -1
sound/aoa/core/snd-aoa-alsa.c
··· 59 59 } 60 60 61 61 int aoa_snd_device_new(snd_device_type_t type, 62 - void * device_data, struct snd_device_ops * ops) 62 + void * device_data, struct snd_device_ops * ops) 63 63 { 64 64 struct snd_card *card = aoa_get_card(); 65 65 int err;
+2 -5
sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
··· 901 901 } 902 902 903 903 if (!dev->pcm) { 904 - err = snd_pcm_new(card, 905 - dev->pcmname, 906 - dev->pcmid, 907 - 0, 908 - 0, 904 + err = snd_pcm_new(card, dev->pcmname, dev->pcmid, 0, 0, 909 905 &dev->pcm); 910 906 if (err) { 911 907 printk(KERN_DEBUG "i2sbus: failed to create pcm\n"); ··· 911 915 module_put(THIS_MODULE); 912 916 return err; 913 917 } 918 + dev->pcm->dev = &dev->ofdev.dev; 914 919 } 915 920 916 921 /* ALSA yet again sucks.