1 files changed, 10 insertions, 6 deletions

diff --git a/sound/arm/sa11xx-uda1341.c b/sound/arm/sa11xx-uda1341.c
index 13057d92f08a..b88fb0c5a68a 100644
--- a/sound/arm/sa11xx-uda1341.c
+++ b/sound/arm/sa11xx-uda1341.c
@@ -112,7 +112,7 @@ MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("SA1100/SA1111 + UDA1341TS driver for ALSA");
 MODULE_SUPPORTED_DEVICE("{{UDA1341,iPAQ H3600 UDA1341TS}}");
 
-static char *id = NULL; /* ID for this card */
+static char *id;        /* ID for this card */
 
 module_param(id, charp, 0444);
 MODULE_PARM_DESC(id, "ID string for SA1100/SA1111 + UDA1341TS soundcard.");
@@ -984,11 +984,15 @@ static int __init sa11xx_uda1341_init(void)
         if ((err = platform_driver_register(&sa11xx_uda1341_driver)) < 0)
                 return err;
         device = platform_device_register_simple(SA11XX_UDA1341_DRIVER, -1, NULL, 0);
-        if (IS_ERR(device)) {
-                platform_driver_unregister(&sa11xx_uda1341_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(&sa11xx_uda1341_driver);
+        return err;
 }
 
 static void __exit sa11xx_uda1341_exit(void)