1 files changed, 35 insertions, 32 deletions

diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c
index ff51dae1df0..c327218cad4 100644
--- a/drivers/tty/serial/ucc_uart.c
+++ b/drivers/tty/serial/ucc_uart.c
@@ -1269,13 +1269,12 @@ static int ucc_uart_probe(struct platform_device *ofdev)
         ret = of_address_to_resource(np, 0, &res);
         if (ret) {
                 dev_err(&ofdev->dev, "missing 'reg' property in device tree\n");
-                kfree(qe_port);
-                return ret;
+                goto out_free;
         }
         if (!res.start) {
                 dev_err(&ofdev->dev, "invalid 'reg' property in device tree\n");
-                kfree(qe_port);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out_free;
         }
         qe_port->port.mapbase = res.start;
 
@@ -1285,17 +1284,17 @@ static int ucc_uart_probe(struct platform_device *ofdev)
         if (!iprop) {
                 iprop = of_get_property(np, "device-id", NULL);
                 if (!iprop) {
-                        kfree(qe_port);
                         dev_err(&ofdev->dev, "UCC is unspecified in "
                                 "device tree\n");
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto out_free;
                 }
         }
 
         if ((*iprop < 1) || (*iprop > UCC_MAX_NUM)) {
                 dev_err(&ofdev->dev, "no support for UCC%u\n", *iprop);
-                kfree(qe_port);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out_free;
         }
         qe_port->ucc_num = *iprop - 1;
 
@@ -1309,16 +1308,16 @@ static int ucc_uart_probe(struct platform_device *ofdev)
         sprop = of_get_property(np, "rx-clock-name", NULL);
         if (!sprop) {
                 dev_err(&ofdev->dev, "missing rx-clock-name in device tree\n");
-                kfree(qe_port);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out_free;
         }
 
         qe_port->us_info.rx_clock = qe_clock_source(sprop);
         if ((qe_port->us_info.rx_clock < QE_BRG1) ||
             (qe_port->us_info.rx_clock > QE_BRG16)) {
                 dev_err(&ofdev->dev, "rx-clock-name must be a BRG for UART\n");
-                kfree(qe_port);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out_free;
         }
 
 #ifdef LOOPBACK
@@ -1328,39 +1327,39 @@ static int ucc_uart_probe(struct platform_device *ofdev)
         sprop = of_get_property(np, "tx-clock-name", NULL);
         if (!sprop) {
                 dev_err(&ofdev->dev, "missing tx-clock-name in device tree\n");
-                kfree(qe_port);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out_free;
         }
         qe_port->us_info.tx_clock = qe_clock_source(sprop);
 #endif
         if ((qe_port->us_info.tx_clock < QE_BRG1) ||
             (qe_port->us_info.tx_clock > QE_BRG16)) {
                 dev_err(&ofdev->dev, "tx-clock-name must be a BRG for UART\n");
-                kfree(qe_port);
-                return -ENODEV;
+                ret = -ENODEV;
+                goto out_free;
         }
 
         /* Get the port number, numbered 0-3 */
         iprop = of_get_property(np, "port-number", NULL);
         if (!iprop) {
                 dev_err(&ofdev->dev, "missing port-number in device tree\n");
-                kfree(qe_port);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out_free;
         }
         qe_port->port.line = *iprop;
         if (qe_port->port.line >= UCC_MAX_UART) {
                 dev_err(&ofdev->dev, "port-number must be 0-%u\n",
                         UCC_MAX_UART - 1);
-                kfree(qe_port);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out_free;
         }
 
         qe_port->port.irq = irq_of_parse_and_map(np, 0);
         if (qe_port->port.irq == NO_IRQ) {
                 dev_err(&ofdev->dev, "could not map IRQ for UCC%u\n",
                        qe_port->ucc_num + 1);
-                kfree(qe_port);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out_free;
         }
 
         /*
@@ -1372,8 +1371,8 @@ static int ucc_uart_probe(struct platform_device *ofdev)
                 np = of_find_node_by_type(NULL, "qe");
                 if (!np) {
                         dev_err(&ofdev->dev, "could not find 'qe' node\n");
-                        kfree(qe_port);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto out_free;
                 }
         }
 
@@ -1381,8 +1380,8 @@ static int ucc_uart_probe(struct platform_device *ofdev)
         if (!iprop) {
                 dev_err(&ofdev->dev,
                        "missing brg-frequency in device tree\n");
-                kfree(qe_port);
-                return -EINVAL;
+                ret = -EINVAL;
+                goto out_np;
         }
 
         if (*iprop)
@@ -1397,16 +1396,16 @@ static int ucc_uart_probe(struct platform_device *ofdev)
                 if (!iprop) {
                         dev_err(&ofdev->dev,
                                 "missing QE bus-frequency in device tree\n");
-                        kfree(qe_port);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto out_np;
                 }
                 if (*iprop)
                         qe_port->port.uartclk = *iprop / 2;
                 else {
                         dev_err(&ofdev->dev,
                                 "invalid QE bus-frequency in device tree\n");
-                        kfree(qe_port);
-                        return -EINVAL;
+                        ret = -EINVAL;
+                        goto out_np;
                 }
         }
 
@@ -1444,8 +1443,7 @@ static int ucc_uart_probe(struct platform_device *ofdev)
         if (ret) {
                 dev_err(&ofdev->dev, "could not add /dev/ttyQE%u\n",
                        qe_port->port.line);
-                kfree(qe_port);
-                return ret;
+                goto out_np;
         }
 
         dev_set_drvdata(&ofdev->dev, qe_port);
@@ -1459,6 +1457,11 @@ static int ucc_uart_probe(struct platform_device *ofdev)
                SERIAL_QE_MINOR + qe_port->port.line);
 
         return 0;
+out_np:
+        of_node_put(np);
+out_free:
+        kfree(qe_port);
+        return ret;
 }
 
 static int ucc_uart_remove(struct platform_device *ofdev)