diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 04:22:14 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 04:22:14 -0500 |
commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/pci/oxygen | |
parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/pci/oxygen')
-rw-r--r-- | sound/pci/oxygen/oxygen_lib.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/oxygen/oxygen_lib.c b/sound/pci/oxygen/oxygen_lib.c index 84f481d41efa..9c81e0b05113 100644 --- a/sound/pci/oxygen/oxygen_lib.c +++ b/sound/pci/oxygen/oxygen_lib.c | |||
@@ -459,10 +459,10 @@ int oxygen_pci_probe(struct pci_dev *pci, int index, char *id, | |||
459 | struct oxygen *chip; | 459 | struct oxygen *chip; |
460 | int err; | 460 | int err; |
461 | 461 | ||
462 | card = snd_card_new(index, id, model->owner, | 462 | err = snd_card_create(index, id, model->owner, |
463 | sizeof *chip + model->model_data_size); | 463 | sizeof(*chip) + model->model_data_size, &card); |
464 | if (!card) | 464 | if (err < 0) |
465 | return -ENOMEM; | 465 | return err; |
466 | 466 | ||
467 | chip = card->private_data; | 467 | chip = card->private_data; |
468 | chip->card = card; | 468 | chip->card = card; |