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/intel8x0.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/intel8x0.c')
| -rw-r--r-- | sound/pci/intel8x0.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index e900cdc84849..608655e9275e 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
| @@ -3058,9 +3058,9 @@ static int __devinit snd_intel8x0_probe(struct pci_dev *pci, | |||
| 3058 | int err; | 3058 | int err; |
| 3059 | struct shortname_table *name; | 3059 | struct shortname_table *name; |
| 3060 | 3060 | ||
| 3061 | card = snd_card_new(index, id, THIS_MODULE, 0); | 3061 | err = snd_card_create(index, id, THIS_MODULE, 0, &card); |
| 3062 | if (card == NULL) | 3062 | if (err < 0) |
| 3063 | return -ENOMEM; | 3063 | return err; |
| 3064 | 3064 | ||
| 3065 | if (spdif_aclink < 0) | 3065 | if (spdif_aclink < 0) |
| 3066 | spdif_aclink = check_default_spdif_aclink(pci); | 3066 | spdif_aclink = check_default_spdif_aclink(pci); |