diff options
author | 2009-03-24 00:35:35 +0100 | |
---|---|---|
committer | 2009-03-24 00:35:35 +0100 | |
commit | dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd (patch) | |
tree | af1744c17c4bacad4c9524ad096d5a65f6c25c73 /sound/drivers/virmidi.c | |
parent | Linux 2.6.29 (diff) | |
parent | ALSA: opti9xx - Fix build breakage by snd_card_create() conversion (diff) | |
download | linux-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.gz linux-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.tar.bz2 linux-dec14f8c0eff54549e5747f8a4d1dc6c0347e2dd.zip |
Merge branch 'topic/snd_card_new-err' into for-linus
Diffstat (limited to 'sound/drivers/virmidi.c')
-rw-r--r-- | sound/drivers/virmidi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/drivers/virmidi.c b/sound/drivers/virmidi.c index f79e3614079d..6f48711818f3 100644 --- a/sound/drivers/virmidi.c +++ b/sound/drivers/virmidi.c @@ -90,10 +90,10 @@ static int __devinit snd_virmidi_probe(struct platform_device *devptr) int idx, err; int dev = devptr->id; - card = snd_card_new(index[dev], id[dev], THIS_MODULE, - sizeof(struct snd_card_virmidi)); - if (card == NULL) - return -ENOMEM; + err = snd_card_create(index[dev], id[dev], THIS_MODULE, + sizeof(struct snd_card_virmidi), &card); + if (err < 0) + return err; vmidi = (struct snd_card_virmidi *)card->private_data; vmidi->card = card; |