| From e1b8ea2df1049d2bc3cbacf6358beac1c5a78129 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 5 Mar 2021 03:49:29 +0000 |
| Subject: serial: liteuart: fix return value check in liteuart_probe() |
| |
| From: Wei Yongjun <weiyongjun1@huawei.com> |
| |
| [ Upstream commit cebeddd6d0d9f839b9df2930b6a768b54913a763 ] |
| |
| In case of error, the function devm_platform_get_and_ioremap_resource() |
| returns ERR_PTR() and never returns NULL. The NULL test in the return |
| value check should be replaced with IS_ERR(). |
| |
| Fixes: 1da81e5562fa ("drivers/tty/serial: add LiteUART driver") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> |
| Link: https://lore.kernel.org/r/20210305034929.3234352-1-weiyongjun1@huawei.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| drivers/tty/serial/liteuart.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/drivers/tty/serial/liteuart.c b/drivers/tty/serial/liteuart.c |
| index 64842f3539e1..0b06770642cb 100644 |
| --- a/drivers/tty/serial/liteuart.c |
| +++ b/drivers/tty/serial/liteuart.c |
| @@ -270,8 +270,8 @@ static int liteuart_probe(struct platform_device *pdev) |
| |
| /* get membase */ |
| port->membase = devm_platform_get_and_ioremap_resource(pdev, 0, NULL); |
| - if (!port->membase) |
| - return -ENXIO; |
| + if (IS_ERR(port->membase)) |
| + return PTR_ERR(port->membase); |
| |
| /* values not from device tree */ |
| port->dev = &pdev->dev; |
| -- |
| 2.30.2 |
| |
