diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-17 17:57:37 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-17 17:57:37 +0100 |
| commit | dbe36c9dd571e035078207862766963c4fc80262 (patch) | |
| tree | 090cd169e9b89c1c6f85dbaec7104c4df958fc5a /sound/ppc/snd_ps3.c | |
| parent | 2ebfb8eeb8f244f9d25937d31a947895cf819e26 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/drop-l3
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"); |