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/via82xx_modem.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/via82xx_modem.c')
| -rw-r--r-- | sound/pci/via82xx_modem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/via82xx_modem.c b/sound/pci/via82xx_modem.c index 5bd79d2a5a15..c086b762c150 100644 --- a/sound/pci/via82xx_modem.c +++ b/sound/pci/via82xx_modem.c | |||
| @@ -1167,9 +1167,9 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci, | |||
| 1167 | unsigned int i; | 1167 | unsigned int i; |
| 1168 | int err; | 1168 | int err; |
| 1169 | 1169 | ||
| 1170 | card = snd_card_new(index, id, THIS_MODULE, 0); | 1170 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
| 1171 | if (card == NULL) | 1171 | if (err < 0) |
| 1172 | return -ENOMEM; | 1172 | return err; |
| 1173 | 1173 | ||
| 1174 | card_type = pci_id->driver_data; | 1174 | card_type = pci_id->driver_data; |
| 1175 | switch (card_type) { | 1175 | switch (card_type) { |