diff options
author | James Morris <jmorris@namei.org> | 2009-03-27 00:28:11 +0300 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-03-27 00:28:11 +0300 |
commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /sound/drivers/ml403-ac97cr.c | |
parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
download | linux-1987f17d2266e882862528841429b5bf67bc8fe5.tar.xz |
Merge branch 'master' into next
Diffstat (limited to 'sound/drivers/ml403-ac97cr.c')
-rw-r--r-- | sound/drivers/ml403-ac97cr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/drivers/ml403-ac97cr.c b/sound/drivers/ml403-ac97cr.c index 7783843ca9ae..1950ffce2b54 100644 --- a/sound/drivers/ml403-ac97cr.c +++ b/sound/drivers/ml403-ac97cr.c @@ -1279,9 +1279,9 @@ static int __devinit snd_ml403_ac97cr_probe(struct platform_device *pfdev) if (!enable[dev]) return -ENOENT; - card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); + if (err < 0) + return err; err = snd_ml403_ac97cr_create(card, pfdev, &ml403_ac97cr); if (err < 0) { PDEBUG(INIT_FAILURE, "probe(): create failed!\n"); |