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/opti9xx/miro.c | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | lwn-6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7.tar.gz lwn-6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7.zip | |
Merge branch 'topic/snd_card_new-err' into topic/atmel
Diffstat (limited to 'sound/isa/opti9xx/miro.c')
| -rw-r--r-- | sound/isa/opti9xx/miro.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/isa/opti9xx/miro.c b/sound/isa/opti9xx/miro.c index 440755cc0013..02e30d7c6a93 100644 --- a/sound/isa/opti9xx/miro.c +++ b/sound/isa/opti9xx/miro.c @@ -1228,9 +1228,10 @@ static int __devinit snd_miro_probe(struct device *devptr, unsigned int n) struct snd_pcm *pcm; struct snd_rawmidi *rmidi; - if (!(card = snd_card_new(index, id, THIS_MODULE, - sizeof(struct snd_miro)))) - return -ENOMEM; + error = snd_card_create(index, id, THIS_MODULE, + sizeof(struct snd_miro), &card); + if (error < 0) + return error; card->private_free = snd_card_miro_free; miro = card->private_data; |