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/ppc/snd_ps3.c | |
parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/ppc/snd_ps3.c')
-rw-r--r-- | sound/ppc/snd_ps3.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sound/ppc/snd_ps3.c b/sound/ppc/snd_ps3.c index ff321110ec0..f361c26506a 100644 --- a/sound/ppc/snd_ps3.c +++ b/sound/ppc/snd_ps3.c @@ -969,11 +969,9 @@ static int __init snd_ps3_driver_probe(struct ps3_system_bus_device *dev) } /* create card instance */ - the_card.card = snd_card_new(index, id, THIS_MODULE, 0); - if (!the_card.card) { - ret = -ENXIO; + ret = snd_card_create(index, id, THIS_MODULE, 0, &the_card.card); + if (ret < 0) goto clean_irq; - } strcpy(the_card.card->driver, "PS3"); strcpy(the_card.card->shortname, "PS3"); |