From 0e34b9fe7b905ce6395546d4443673c32485b7d4 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 12 Jan 2009 15:19:08 +0100
Subject: [PATCH] --- yaml --- r: 132723 b: refs/heads/master c:
 183c6e0fb4e39c860960de4abd7541bd260491bb h: refs/heads/master i:   132721:
 3da434a4c71a2b1ad00ab7793322b9e157781c30   132719:
 b86797243f8d464d1ff48914cfcb216f61029f34 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/usb/gadget/gmidi.c | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 207b77304038..bcf591326013 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ff1871617a3ea1eeaf88b42f652f9a311826bad
+refs/heads/master: 183c6e0fb4e39c860960de4abd7541bd260491bb
diff --git a/trunk/drivers/usb/gadget/gmidi.c b/trunk/drivers/usb/gadget/gmidi.c
index 60d3f9e9b51f..14e09abbddfc 100644
--- a/trunk/drivers/usb/gadget/gmidi.c
+++ b/trunk/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;