Merge branch 'topic/snd_card_new-err' into for-linus

1 files changed, 3 insertions, 4 deletions

diff --git a/drivers/usb/gadget/gmidi.c b/drivers/usb/gadget/gmidi.c
index 60d3f9e9b51f..14e09abbddfc 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;