Commit c195438f authored by Lad Prabhakar's avatar Lad Prabhakar Committed by Greg Kroah-Hartman
Browse files

serial: 8250_bcm7271: Propagate error codes from brcmuart_probe() 



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: 41a46948 ("serial: 8250: Add new 8250-core based Broadcom STB driver")
Acked-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarLad 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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56c8b1c1

drivers/tty/serial/8250/8250_bcm7271.c

+8 −3
Original line number Diff line number Diff line
@@ -1074,15 +1074,19 @@ 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);

	if (ret < 0) {
@@ -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 @@ static int brcmuart_probe(struct platform_device *pdev) 
err:

	brcmuart_free_bufs(dev, priv);

	brcmuart_arbitration(priv, 0);

	return -ENODEV;

	return ret;

}



static int brcmuart_remove(struct platform_device *pdev)