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/oxygen/oxygen_lib.c | |
parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/pci/oxygen/oxygen_lib.c')
-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; |