diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-03-23 19:35:35 -0400 |
| commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
| tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/pci/maestro3.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
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) | |||
| 2691 | return -ENOENT; | 2691 | return -ENOENT; |
| 2692 | } | 2692 | } |
| 2693 | 2693 | ||
| 2694 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 2694 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 2695 | if (card == NULL) | 2695 | if (err < 0) |
| 2696 | return -ENOMEM; | 2696 | return err; |
| 2697 | 2697 | ||
| 2698 | switch (pci->device) { | 2698 | switch (pci->device) { |
| 2699 | case PCI_DEVICE_ID_ESS_ALLEGRO: | 2699 | case PCI_DEVICE_ID_ESS_ALLEGRO: |