tty: xilinx_uartps: Correct return value in probe

[linux.git] / drivers / tty / serial / xilinx_uartps.c

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 094f2958cb2bb8db3298fd40fa268eae55dc7f65..74089f5e5b53b69e82d0eae0b0d075ccbd106428 100644 (file)
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -364,7 +364,13 @@ static irqreturn_t cdns_uart_isr(int irq, void *dev_id)
                cdns_uart_handle_tx(dev_id);
                isrstatus &= ~CDNS_UART_IXR_TXEMPTY;
        }
-       if (isrstatus & CDNS_UART_IXR_RXMASK)
+
+       /*
+        * Skip RX processing if RX is disabled as RXEMPTY will never be set
+        * as read bytes will not be removed from the FIFO.
+        */
+       if (isrstatus & CDNS_UART_IXR_RXMASK &&
+           !(readl(port->membase + CDNS_UART_CR) & CDNS_UART_CR_RX_DIS))
                cdns_uart_handle_rx(dev_id, isrstatus);
 
        spin_unlock(&port->lock);
@@ -1547,27 +1553,33 @@ static int cdns_uart_probe(struct platform_device *pdev)
        }
 
        cdns_uart_data->pclk = devm_clk_get(&pdev->dev, "pclk");
+       if (PTR_ERR(cdns_uart_data->pclk) == -EPROBE_DEFER) {
+               rc = PTR_ERR(cdns_uart_data->pclk);
+               goto err_out_unregister_driver;
+       }
+
        if (IS_ERR(cdns_uart_data->pclk)) {
                cdns_uart_data->pclk = devm_clk_get(&pdev->dev, "aper_clk");
-               if (!IS_ERR(cdns_uart_data->pclk))
-                       dev_err(&pdev->dev, "clock name 'aper_clk' is deprecated.\n");
+               if (IS_ERR(cdns_uart_data->pclk)) {
+                       rc = PTR_ERR(cdns_uart_data->pclk);
+                       goto err_out_unregister_driver;
+               }
+               dev_err(&pdev->dev, "clock name 'aper_clk' is deprecated.\n");
        }
-       if (IS_ERR(cdns_uart_data->pclk)) {
-               dev_err(&pdev->dev, "pclk clock not found.\n");
-               rc = PTR_ERR(cdns_uart_data->pclk);
+
+       cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "uart_clk");
+       if (PTR_ERR(cdns_uart_data->uartclk) == -EPROBE_DEFER) {
+               rc = PTR_ERR(cdns_uart_data->uartclk);
                goto err_out_unregister_driver;
        }
 
-       cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "uart_clk");
        if (IS_ERR(cdns_uart_data->uartclk)) {
                cdns_uart_data->uartclk = devm_clk_get(&pdev->dev, "ref_clk");
-               if (!IS_ERR(cdns_uart_data->uartclk))
-                       dev_err(&pdev->dev, "clock name 'ref_clk' is deprecated.\n");
-       }
-       if (IS_ERR(cdns_uart_data->uartclk)) {
-               dev_err(&pdev->dev, "uart_clk clock not found.\n");
-               rc = PTR_ERR(cdns_uart_data->uartclk);
-               goto err_out_unregister_driver;
+               if (IS_ERR(cdns_uart_data->uartclk)) {
+                       rc = PTR_ERR(cdns_uart_data->uartclk);
+                       goto err_out_unregister_driver;
+               }
+               dev_err(&pdev->dev, "clock name 'ref_clk' is deprecated.\n");
        }
 
        rc = clk_prepare_enable(cdns_uart_data->pclk);