diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2006-10-05 09:07:23 -0400 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:00:08 -0500 |
commit | 73e85fe8452b950b93cfb61377f749e9b15437fb (patch) | |
tree | a8e9a8935143b748bbc955bf6cc53402dd642156 | |
parent | c78085fcd2ce7cd036e1488472eb41a64d70949a (diff) |
[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>
-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) | |||
59 | } | 59 | } |
60 | 60 | ||
61 | int aoa_snd_device_new(snd_device_type_t type, | 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 | struct snd_card *card = aoa_get_card(); | 64 | struct snd_card *card = aoa_get_card(); |
65 | int err; | 65 | 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, | |||
901 | } | 901 | } |
902 | 902 | ||
903 | if (!dev->pcm) { | 903 | if (!dev->pcm) { |
904 | err = snd_pcm_new(card, | 904 | err = snd_pcm_new(card, dev->pcmname, dev->pcmid, 0, 0, |
905 | dev->pcmname, | ||
906 | dev->pcmid, | ||
907 | 0, | ||
908 | 0, | ||
909 | &dev->pcm); | 905 | &dev->pcm); |
910 | if (err) { | 906 | if (err) { |
911 | printk(KERN_DEBUG "i2sbus: failed to create pcm\n"); | 907 | 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 | module_put(THIS_MODULE); | 911 | module_put(THIS_MODULE); |
916 | return err; | 912 | return err; |
917 | } | 913 | } |
914 | dev->pcm->dev = &dev->ofdev.dev; | ||
918 | } | 915 | } |
919 | 916 | ||
920 | /* ALSA yet again sucks. | 917 | /* ALSA yet again sucks. |