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.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/via82xx.c')
| -rw-r--r-- | sound/pci/via82xx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/via82xx.c b/sound/pci/via82xx.c index 1aafe956ee2b..d8705547dae1 100644 --- a/sound/pci/via82xx.c +++ b/sound/pci/via82xx.c | |||
| @@ -2433,9 +2433,9 @@ static int __devinit snd_via82xx_probe(struct pci_dev *pci, | |||
| 2433 | unsigned int i; | 2433 | unsigned int i; |
| 2434 | int err; | 2434 | int err; |
| 2435 | 2435 | ||
| 2436 | card = snd_card_new(index, id, THIS_MODULE, 0); | 2436 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
| 2437 | if (card == NULL) | 2437 | if (err < 0) |
| 2438 | return -ENOMEM; | 2438 | return err; |
| 2439 | 2439 | ||
| 2440 | card_type = pci_id->driver_data; | 2440 | card_type = pci_id->driver_data; |
| 2441 | switch (card_type) { | 2441 | switch (card_type) { |