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/als300.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/als300.c')
| -rw-r--r-- | sound/pci/als300.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index 8df6824b51cd..f557c155db48 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c | |||
| @@ -812,10 +812,10 @@ static int __devinit snd_als300_probe(struct pci_dev *pci, | |||
| 812 | return -ENOENT; | 812 | return -ENOENT; |
| 813 | } | 813 | } |
| 814 | 814 | ||
| 815 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 815 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 816 | 816 | ||
| 817 | if (card == NULL) | 817 | if (err < 0) |
| 818 | return -ENOMEM; | 818 | return err; |
| 819 | 819 | ||
| 820 | chip_type = pci_id->driver_data; | 820 | chip_type = pci_id->driver_data; |
| 821 | 821 | ||