diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 10:22:14 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 10:22:14 +0100 |
commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/drivers/ml403-ac97cr.c | |
parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
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"); |