Merge 3.10-rc5 into tty-next

[deliverable/linux.git] / drivers / tty / serial / samsung.c

diff --git a/drivers/tty/serial/samsung.c b/drivers/tty/serial/samsung.c
index 0c8a9fa2be6cee12182bb8e32e0ed37be1c8fdab..81ebc86a9e23480fe2498093e96a44429f1d880a 100644 (file)
--- a/drivers/tty/serial/samsung.c
+++ b/drivers/tty/serial/samsung.c
@@ -1811,7 +1811,13 @@ static int __init s3c24xx_serial_modinit(void)
                return ret;
        }
 
-       return platform_driver_register(&samsung_serial_driver);
+       ret = platform_driver_register(&samsung_serial_driver);
+       if (ret < 0) {
+               pr_err("Failed to register platform driver\n");
+               uart_unregister_driver(&s3c24xx_uart_drv);
+       }
+
+       return ret;
 }
 
 static void __exit s3c24xx_serial_modexit(void)