serial: 8250_bcm7271: Propagate error codes from brcmuart_probe()
authorLad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Fri, 24 Dec 2021 14:29:09 +0000 (14:29 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Dec 2021 12:26:48 +0000 (13:26 +0100)
In case of failures brcmuart_probe() always returned -ENODEV, this
isn't correct for example platform_get_irq_byname() may return
-EPROBE_DEFER to handle such cases propagate error codes in
brcmuart_probe() in case of failures.

Fixes: 41a469482de25 ("serial: 8250: Add new 8250-core based Broadcom STB driver")
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
Link: https://lore.kernel.org/r/20211224142917.6966-4-prabhakar.mahadev-lad.rj@bp.renesas.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/tty/serial/8250/8250_bcm7271.c

index 7ecfcc6..cc60a78 100644 (file)
@@ -1074,14 +1074,18 @@ static int brcmuart_probe(struct platform_device *pdev)
                priv->rx_bufs = dma_alloc_coherent(dev,
                                                   priv->rx_size,
                                                   &priv->rx_addr, GFP_KERNEL);
-               if (!priv->rx_bufs)
+               if (!priv->rx_bufs) {
+                       ret = -EINVAL;
                        goto err;
+               }
                priv->tx_size = UART_XMIT_SIZE;
                priv->tx_buf = dma_alloc_coherent(dev,
                                                  priv->tx_size,
                                                  &priv->tx_addr, GFP_KERNEL);
-               if (!priv->tx_buf)
+               if (!priv->tx_buf) {
+                       ret = -EINVAL;
                        goto err;
+               }
        }
 
        ret = serial8250_register_8250_port(&up);
@@ -1095,6 +1099,7 @@ static int brcmuart_probe(struct platform_device *pdev)
        if (priv->dma_enabled) {
                dma_irq = platform_get_irq_byname(pdev,  "dma");
                if (dma_irq < 0) {
+                       ret = dma_irq;
                        dev_err(dev, "no IRQ resource info\n");
                        goto err1;
                }
@@ -1114,7 +1119,7 @@ err1:
 err:
        brcmuart_free_bufs(dev, priv);
        brcmuart_arbitration(priv, 0);
-       return -ENODEV;
+       return ret;
 }
 
 static int brcmuart_remove(struct platform_device *pdev)