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/aw2/aw2-alsa.c | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/aw2/aw2-alsa.c')
| -rw-r--r-- | sound/pci/aw2/aw2-alsa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/aw2/aw2-alsa.c b/sound/pci/aw2/aw2-alsa.c index c7c54e7748e9..8eea29fc42fe 100644 --- a/sound/pci/aw2/aw2-alsa.c +++ b/sound/pci/aw2/aw2-alsa.c | |||
| @@ -368,9 +368,9 @@ static int __devinit snd_aw2_probe(struct pci_dev *pci, | |||
| 368 | } | 368 | } |
| 369 | 369 | ||
| 370 | /* (2) Create card instance */ | 370 | /* (2) Create card instance */ |
| 371 | card = snd_card_new(index[dev], id[dev], THIS_MODULE, 0); | 371 | err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card); |
| 372 | if (card == NULL) | 372 | if (err < 0) |
| 373 | return -ENOMEM; | 373 | return err; |
| 374 | 374 | ||
| 375 | /* (3) Create main component */ | 375 | /* (3) Create main component */ |
| 376 | err = snd_aw2_create(card, pci, &chip); | 376 | err = snd_aw2_create(card, pci, &chip); |