diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-02-19 10:22:14 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-02-19 10:22:14 +0100 |
| commit | a5e0e970c06065a14844b406a0c2a59776a1ccc6 (patch) | |
| tree | 1da3f4aac02e29f0dfbd099b17412011ca950cb8 /sound/pci/oxygen | |
| parent | 6ce6c473a7fd742fdb0db95841e2c4c6b37337c5 (diff) | |
| parent | b1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff) | |
| download | linux-3.10-a5e0e970c06065a14844b406a0c2a59776a1ccc6.tar.gz linux-3.10-a5e0e970c06065a14844b406a0c2a59776a1ccc6.tar.bz2 linux-3.10-a5e0e970c06065a14844b406a0c2a59776a1ccc6.zip | |
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 84f481d41ef..9c81e0b0511 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, struct oxygen *chip; int err; - card = snd_card_new(index, id, model->owner, - sizeof *chip + model->model_data_size); - if (!card) - return -ENOMEM; + err = snd_card_create(index, id, model->owner, + sizeof(*chip) + model->model_data_size, &card); + if (err < 0) + return err; chip = card->private_data; chip->card = card; |