summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWei Yongjun <weiyongjun1@huawei.com>2021-03-29 14:06:59 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-04-02 16:12:14 +0200
commit64b1510642f845d90ad2aa35111582a4492e801b (patch)
tree0a9a305b1162c6d4cbb63c9d85931264a4e8bf79
parent211b4d42b70f1c1660feaa968dac0efc2a96ac4d (diff)
serial: 8250_bcm7271: Fix return value check in brcmuart_probe()
In case of error, the function devm_ioremap() returns NULL pointer not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. Fixes: 41a469482de2 ("serial: 8250: Add new 8250-core based Broadcom STB driver") Reported-by: Hulk Robot <hulkci@huawei.com> Reviewed-by: Al Cooper <alcooperx@gmail.com> Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com> Link: https://lore.kernel.org/r/20210329140659.1832950-1-weiyongjun1@huawei.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/serial/8250/8250_bcm7271.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/8250/8250_bcm7271.c b/drivers/tty/serial/8250/8250_bcm7271.c
index 63883185fccd..a4f3f6301d4f 100644
--- a/drivers/tty/serial/8250/8250_bcm7271.c
+++ b/drivers/tty/serial/8250/8250_bcm7271.c
@@ -974,8 +974,8 @@ static int brcmuart_probe(struct platform_device *pdev)
break;
priv->regs[x] = devm_ioremap(dev, regs->start,
resource_size(regs));
- if (IS_ERR(priv->regs[x]))
- return PTR_ERR(priv->regs[x]);
+ if (!priv->regs[x])
+ return -ENOMEM;
if (x == REGS_8250) {
mapbase = regs->start;
membase = priv->regs[x];