1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index 7355303dad99..88317482b81f 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -1451,7 +1451,7 @@ static int ucc_uart_probe(struct platform_device *ofdev)
                 goto out_np;
         }
 
-        dev_set_drvdata(&ofdev->dev, qe_port);
+        platform_set_drvdata(ofdev, qe_port);
 
         dev_info(&ofdev->dev, "UCC%u assigned to /dev/ttyQE%u\n",
                 qe_port->ucc_num + 1, qe_port->port.line);
@@ -1471,13 +1471,12 @@ out_free:
 
 static int ucc_uart_remove(struct platform_device *ofdev)
 {
-        struct uart_qe_port *qe_port = dev_get_drvdata(&ofdev->dev);
+        struct uart_qe_port *qe_port = platform_get_drvdata(ofdev);
 
         dev_info(&ofdev->dev, "removing /dev/ttyQE%u\n", qe_port->port.line);
 
         uart_remove_one_port(&ucc_uart_driver, &qe_port->port);
 
-        dev_set_drvdata(&ofdev->dev, NULL);
         kfree(qe_port);
 
         return 0;
@@ -1518,9 +1517,11 @@ static int __init ucc_uart_init(void)
         }
 
         ret = platform_driver_register(&ucc_uart_of_driver);
-        if (ret)
+        if (ret) {
                 printk(KERN_ERR
                        "ucc-uart: could not register platform driver\n");
+                uart_unregister_driver(&ucc_uart_driver);
+        }
 
         return ret;
 }