From 64b1510642f845d90ad2aa35111582a4492e801b Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Mon, 29 Mar 2021 14:06:59 +0000 Subject: [PATCH] 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 Reviewed-by: Al Cooper Signed-off-by: Wei Yongjun Link: https://lore.kernel.org/r/20210329140659.1832950-1-weiyongjun1@huawei.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/serial/8250/8250_bcm7271.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_bcm7271.c b/drivers/tty/serial/8250/8250_bcm7271.c index 6388318..a4f3f63 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]; -- 2.7.4