Commit 73e85fe8 authored by Johannes Berg's avatar Johannes Berg Committed by Jaroslav Kysela

[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: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent c78085fc
...@@ -59,7 +59,7 @@ void aoa_alsa_cleanup(void) ...@@ -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;
......
...@@ -901,11 +901,7 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card, ...@@ -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, ...@@ -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.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment