Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[ALSA] aoa: set device pointer in pcms

Browse source 
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>
This commit is contained in:
Johannes Berg 2006-10-05 15:07:23 +02:00 committed by Jaroslav Kysela
parent c78085fcd2
commit 73e85fe845
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sound/aoa/core/snd-aoa-alsa.c
View file

@ -59,7 +59,7 @@ void aoa_alsa_cleanup(void)
} }
int aoa_snd_device_new(snd_device_type_t type, int aoa_snd_device_new(snd_device_type_t type,
void * device_data, struct snd_device_ops * ops) void * device_data, struct snd_device_ops * ops)
{ {
struct snd_card *card = aoa_get_card(); struct snd_card *card = aoa_get_card();
int err; int err;

7
sound/aoa/soundbus/i2sbus/i2sbus-pcm.c
View file

@ -901,11 +901,7 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
} }
if (!dev->pcm) { if (!dev->pcm) {
err = snd_pcm_new(card, err = snd_pcm_new(card, dev->pcmname, dev->pcmid, 0, 0,
dev->pcmname,
dev->pcmid,
0,
0,
&dev->pcm); &dev->pcm);
if (err) { if (err) {
printk(KERN_DEBUG "i2sbus: failed to create pcm\n"); printk(KERN_DEBUG "i2sbus: failed to create pcm\n");
@ -915,6 +911,7 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card,
module_put(THIS_MODULE); module_put(THIS_MODULE);
return err; return err;
} }
dev->pcm->dev = &dev->ofdev.dev;
} }
/* ALSA yet again sucks. /* ALSA yet again sucks.