1 files changed, 9 insertions, 5 deletions

diff --git a/sound/drivers/mtpav.c b/sound/drivers/mtpav.c
index b7a0b42813e1..474eed06e70f 100644
--- a/sound/drivers/mtpav.c
+++ b/sound/drivers/mtpav.c
@@ -770,11 +770,15 @@ static int __init alsa_card_mtpav_init(void)
                 return err;
 
         device = platform_device_register_simple(SND_MTPAV_DRIVER, -1, NULL, 0);
-        if (IS_ERR(device)) {
-                platform_driver_unregister(&snd_mtpav_driver);
-                return PTR_ERR(device);
-        }
-        return 0;
+        if (!IS_ERR(device)) {
+                if (platform_get_drvdata(device))
+                        return 0;
+                platform_device_unregister(device);
+                err = -ENODEV;
+        } else
+                err = PTR_ERR(device);
+        platform_driver_unregister(&snd_mtpav_driver);
+        return err;
 }
 
 static void __exit alsa_card_mtpav_exit(void)