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/isa/dt019x.c | |
| parent | sound: virtuoso: revert "do not overwrite EEPROM on Xonar D2/D2X" (diff) | |
| parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
| download | linux-a5e0e970c06065a14844b406a0c2a59776a1ccc6.tar.xz linux-a5e0e970c06065a14844b406a0c2a59776a1ccc6.zip | |
Merge branch 'topic/snd_card_new-err' into topic/oxygen
Diffstat (limited to 'sound/isa/dt019x.c')
| -rw-r--r-- | sound/isa/dt019x.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/isa/dt019x.c b/sound/isa/dt019x.c index a0242c3b613e..80f5b1af9be8 100644 --- a/sound/isa/dt019x.c +++ b/sound/isa/dt019x.c @@ -150,9 +150,10 @@ static int __devinit snd_card_dt019x_probe(int dev, struct pnp_card_link *pcard, struct snd_card_dt019x *acard; struct snd_opl3 *opl3; - if ((card = snd_card_new(index[dev], id[dev], THIS_MODULE, - sizeof(struct snd_card_dt019x))) == NULL) - return -ENOMEM; + error = snd_card_create(index[dev], id[dev], THIS_MODULE, + sizeof(struct snd_card_dt019x), &card); + if (error < 0) + return error; acard = card->private_data; snd_card_set_dev(card, &pcard->card->dev); |