[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <20211223114038.1306663-1-jiasheng@iscas.ac.cn>
Date: Thu, 23 Dec 2021 19:40:38 +0800
From: Jiasheng Jiang <jiasheng@...as.ac.cn>
To: andy.shevchenko@...il.com, gregkh@...uxfoundation.org,
jirislaby@...nel.org, liviu.dudau@....com, sudeep.holla@....com,
lorenzo.pieralisi@....com
Cc: linux-serial@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org, Jiasheng Jiang <jiasheng@...as.ac.cn>
Subject: [PATCH v2] serial: mps2-uart: Check for error irq
On Thursday, December 23, 2021, Andy Shevchenko <andy.shevchenko@...il.com> wrote:
> Check the types.
That's right.
I correct previous version, using error variable to check.
Fixes: 041f031def33 ("serial: mps2-uart: add MPS2 UART driver")
Signed-off-by: Jiasheng Jiang <jiasheng@...as.ac.cn>
---
Changelog:
v1 -> v2
*Change 1.USing error variable to check.
---
drivers/tty/serial/mps2-uart.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/mps2-uart.c b/drivers/tty/serial/mps2-uart.c
index 587b42f754cb..24a52300d8d9 100644
--- a/drivers/tty/serial/mps2-uart.c
+++ b/drivers/tty/serial/mps2-uart.c
@@ -584,11 +584,29 @@ static int mps2_init_port(struct platform_device *pdev,
if (mps_port->flags & UART_PORT_COMBINED_IRQ) {
- mps_port->port.irq = platform_get_irq(pdev, 0);
+ ret = platform_get_irq(pdev, 0);
+ if (ret < 0)
+ return ret;
+
+ mps_port->port.irq = ret;
} else {
- mps_port->rx_irq = platform_get_irq(pdev, 0);
- mps_port->tx_irq = platform_get_irq(pdev, 1);
- mps_port->port.irq = platform_get_irq(pdev, 2);
+ ret = platform_get_irq(pdev, 0);
+ if (ret < 0)
+ return ret;
+
+ mps_port->rx_irq = ret;
+
+ ret = platform_get_irq(pdev, 1);
+ if (ret < 0)
+ return ret;
+
+ mps_port->tx_irq = ret;
+
+ ret = platform_get_irq(pdev, 2);
+ if (ret < 0)
+ return ret;
+
+ mps_port->port.irq = ret;
}
return ret;
--
2.25.1
Powered by blists - more mailing lists