diff options
| author | James Morris <jmorris@namei.org> | 2009-03-27 08:28:11 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-27 08:28:11 +1100 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /sound/mips/au1x00.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
| download | linux-1987f17d2266e882862528841429b5bf67bc8fe5.tar.gz linux-1987f17d2266e882862528841429b5bf67bc8fe5.tar.bz2 linux-1987f17d2266e882862528841429b5bf67bc8fe5.zip | |
Merge branch 'master' into next
Diffstat (limited to 'sound/mips/au1x00.c')
| -rw-r--r-- | sound/mips/au1x00.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/mips/au1x00.c b/sound/mips/au1x00.c index 1881cec11e78..3e763d6a5d67 100644 --- a/sound/mips/au1x00.c +++ b/sound/mips/au1x00.c @@ -636,9 +636,10 @@ au1000_init(void) struct snd_card *card; struct snd_au1000 *au1000; - card = snd_card_new(-1, "AC97", THIS_MODULE, sizeof(struct snd_au1000)); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(-1, "AC97", THIS_MODULE, + sizeof(struct snd_au1000), &card); + if (err < 0) + return err; card->private_free = snd_au1000_free; au1000 = card->private_data; @@ -678,7 +679,7 @@ au1000_init(void) return err; } - printk( KERN_INFO "ALSA AC97: Driver Initialized\n" ); + printk(KERN_INFO "ALSA AC97: Driver Initialized\n"); au1000_card = card; return 0; } |