diff options
Diffstat (limited to 'sound/aoa/core/alsa.c')
-rw-r--r-- | sound/aoa/core/alsa.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/aoa/core/alsa.c b/sound/aoa/core/alsa.c index 0fa3855b4790..4a7e4e6b746f 100644 --- a/sound/aoa/core/alsa.c +++ b/sound/aoa/core/alsa.c | |||
@@ -23,13 +23,12 @@ int aoa_alsa_init(char *name, struct module *mod, struct device *dev) | |||
23 | /* cannot be EEXIST due to usage in aoa_fabric_register */ | 23 | /* cannot be EEXIST due to usage in aoa_fabric_register */ |
24 | return -EBUSY; | 24 | return -EBUSY; |
25 | 25 | ||
26 | err = snd_card_create(index, name, mod, sizeof(struct aoa_card), | 26 | err = snd_card_new(dev, index, name, mod, sizeof(struct aoa_card), |
27 | &alsa_card); | 27 | &alsa_card); |
28 | if (err < 0) | 28 | if (err < 0) |
29 | return err; | 29 | return err; |
30 | aoa_card = alsa_card->private_data; | 30 | aoa_card = alsa_card->private_data; |
31 | aoa_card->alsa_card = alsa_card; | 31 | aoa_card->alsa_card = alsa_card; |
32 | alsa_card->dev = dev; | ||
33 | strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver)); | 32 | strlcpy(alsa_card->driver, "AppleOnbdAudio", sizeof(alsa_card->driver)); |
34 | strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname)); | 33 | strlcpy(alsa_card->shortname, name, sizeof(alsa_card->shortname)); |
35 | strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname)); | 34 | strlcpy(alsa_card->longname, name, sizeof(alsa_card->longname)); |
@@ -60,7 +59,7 @@ void aoa_alsa_cleanup(void) | |||
60 | } | 59 | } |
61 | } | 60 | } |
62 | 61 | ||
63 | int aoa_snd_device_new(snd_device_type_t type, | 62 | int aoa_snd_device_new(enum snd_device_type type, |
64 | void * device_data, struct snd_device_ops * ops) | 63 | void * device_data, struct snd_device_ops * ops) |
65 | { | 64 | { |
66 | struct snd_card *card = aoa_get_card(); | 65 | struct snd_card *card = aoa_get_card(); |