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/sis7019.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/sis7019.c')
| -rw-r--r-- | sound/pci/sis7019.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/pci/sis7019.c b/sound/pci/sis7019.c index df2007e3be7c..baf6d8e3dabc 100644 --- a/sound/pci/sis7019.c +++ b/sound/pci/sis7019.c | |||
| @@ -1387,9 +1387,8 @@ static int __devinit snd_sis7019_probe(struct pci_dev *pci, | |||
| 1387 | if (!enable) | 1387 | if (!enable) |
| 1388 | goto error_out; | 1388 | goto error_out; |
| 1389 | 1389 | ||
| 1390 | rc = -ENOMEM; | 1390 | rc = snd_card_create(index, id, THIS_MODULE, sizeof(*sis), &card); |
| 1391 | card = snd_card_new(index, id, THIS_MODULE, sizeof(*sis)); | 1391 | if (rc < 0) |
| 1392 | if (!card) | ||
| 1393 | goto error_out; | 1392 | goto error_out; |
| 1394 | 1393 | ||
| 1395 | strcpy(card->driver, "SiS7019"); | 1394 | strcpy(card->driver, "SiS7019"); |