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/pci/maestro3.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/pci/maestro3.c')
| -rw-r--r-- | sound/pci/maestro3.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/maestro3.c b/sound/pci/maestro3.c index 59bbaf8f3e5b..70141548f251 100644 --- a/sound/pci/maestro3.c +++ b/sound/pci/maestro3.c @@ -2691,9 +2691,9 @@ snd_m3_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) 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; switch (pci->device) { case PCI_DEVICE_ID_ESS_ALLEGRO: |