aboutsummaryrefslogtreecommitdiff
path: root/drivers/usb
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2009-01-28 08:08:32 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-28 08:08:32 +0100
commit67fcdead3c7424d51e7108c220c9ab1a5e752ed3 (patch)
tree3c48fabced8e519ef3f83209a793dfea48dbbfa8 /drivers/usb
parent006f367e38fb45e2f161c0f500c74449ae63e866 (diff)
parentb1a0aac05f044e78a589bfd7a9e2334aa640eb45 (diff)
Merge branch 'topic/snd_card_new-err' into topic/asoc
Conflicts: sound/soc/soc-core.c
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/gmidi.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 60d3f9e9b51..14e09abbddf 100644
--- a/drivers/usb/gadget/gmidi.c
+++ b/drivers/usb/gadget/gmidi.c
@@ -1099,10 +1099,9 @@ static int gmidi_register_card(struct gmidi_device *dev)
.dev_free = gmidi_snd_free,
};
- card = snd_card_new(index, id, THIS_MODULE, 0);
- if (!card) {
- ERROR(dev, "snd_card_new failed\n");
- err = -ENOMEM;
+ err = snd_card_create(index, id, THIS_MODULE, 0, &card);
+ if (err < 0) {
+ ERROR(dev, "snd_card_create failed\n");
goto fail;
}
dev->card = card;