diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2006-10-05 15:07:23 +0200 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 09:00:08 +0100 |
| commit | 73e85fe8452b950b93cfb61377f749e9b15437fb (patch) | |
| tree | a8e9a8935143b748bbc955bf6cc53402dd642156 /sound/aoa | |
| parent | c78085fcd2ce7cd036e1488472eb41a64d70949a (diff) | |
| download | linux-stable-73e85fe8452b950b93cfb61377f749e9b15437fb.tar.gz linux-stable-73e85fe8452b950b93cfb61377f749e9b15437fb.tar.bz2 linux-stable-73e85fe8452b950b93cfb61377f749e9b15437fb.zip | |
[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>
Diffstat (limited to 'sound/aoa')
| -rw-r--r-- | sound/aoa/core/snd-aoa-alsa.c | 2 | ||||
| -rw-r--r-- | sound/aoa/soundbus/i2sbus/i2sbus-pcm.c | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/sound/aoa/core/snd-aoa-alsa.c b/sound/aoa/core/snd-aoa-alsa.c index b42fdea77ed0..8c5a19bd602a 100644 --- a/sound/aoa/core/snd-aoa-alsa.c +++ b/sound/aoa/core/snd-aoa-alsa.c @@ -59,7 +59,7 @@ void aoa_alsa_cleanup(void) } 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(); int err; diff --git a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c index 5eff30b10201..051bb9b200ee 100644 --- a/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c +++ b/sound/aoa/soundbus/i2sbus/i2sbus-pcm.c @@ -901,11 +901,7 @@ i2sbus_attach_codec(struct soundbus_dev *dev, struct snd_card *card, } if (!dev->pcm) { - err = snd_pcm_new(card, - dev->pcmname, - dev->pcmid, - 0, - 0, + err = snd_pcm_new(card, dev->pcmname, dev->pcmid, 0, 0, &dev->pcm); if (err) { 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); return err; } + dev->pcm->dev = &dev->ofdev.dev; } /* ALSA yet again sucks. |