All i.MX SoCs except i.MX1 have ONLY 1 IRQ, so it is better to check
the IRQ count before getting second/third IRQ to avoid below error
message during probe:

[    0.726219] imx-uart 30860000.serial: IRQ index 1 not found
[    0.731329] imx-uart 30860000.serial: IRQ index 2 not found

Signed-off-by: Anson Huang <anson.hu...@nxp.com>
---
 drivers/tty/serial/imx.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c
index 504d81c..081fa82 100644
--- a/drivers/tty/serial/imx.c
+++ b/drivers/tty/serial/imx.c
@@ -2198,6 +2198,7 @@ static int imx_uart_probe(struct platform_device *pdev)
        u32 ucr1;
        struct resource *res;
        int txirq, rxirq, rtsirq;
+       int irq_count;
 
        sport = devm_kzalloc(&pdev->dev, sizeof(*sport), GFP_KERNEL);
        if (!sport)
@@ -2220,9 +2221,17 @@ static int imx_uart_probe(struct platform_device *pdev)
        if (IS_ERR(base))
                return PTR_ERR(base);
 
+       irq_count = platform_irq_count(pdev);
+       if (irq_count < 0)
+               return irq_count;
+
        rxirq = platform_get_irq(pdev, 0);
-       txirq = platform_get_irq(pdev, 1);
-       rtsirq = platform_get_irq(pdev, 2);
+       if (irq_count > 1) {
+               txirq = platform_get_irq(pdev, 1);
+               rtsirq = platform_get_irq(pdev, 2);
+       } else {
+               txirq = rtsirq = -ENXIO;
+       }
 
        sport->port.dev = &pdev->dev;
        sport->port.mapbase = res->start;
-- 
2.7.4

Reply via email to