diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 15:08:33 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 15:08:33 +0100 |
| commit | 6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 (patch) | |
| tree | 2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179 /sound/isa/gus/gusmax.c | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | talos-op-linux-6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7.tar.gz talos-op-linux-6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7.zip | |
Merge branch 'topic/snd_card_new-err' into topic/atmel
Diffstat (limited to 'sound/isa/gus/gusmax.c')
| -rw-r--r-- | sound/isa/gus/gusmax.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/isa/gus/gusmax.c b/sound/isa/gus/gusmax.c index f94c1976e632..f26eac8d8110 100644 --- a/sound/isa/gus/gusmax.c +++ b/sound/isa/gus/gusmax.c @@ -214,10 +214,10 @@ static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev) struct snd_wss *wss; struct snd_gusmax *maxcard; - card = snd_card_new(index[dev], id[dev], THIS_MODULE, - sizeof(struct snd_gusmax)); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, + sizeof(struct snd_gusmax), &card); + if (err < 0) + return err; card->private_free = snd_gusmax_free; maxcard = (struct snd_gusmax *)card->private_data; maxcard->card = card; |
