diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:08:33 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-05 09:08:33 -0500 |
| commit | 6bd0dd5f0ec67f654ebf95be8ef414afae1eecb7 (patch) | |
| tree | 2d6a9fdb99ddd1fb61fac029a4e04ac96e12c179 /sound/pci/via82xx_modem.c | |
| parent | 18e352e4a73465349711a9324767e1b2453383e2 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into topic/atmel
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) { |