linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] soc: ixp4xx: qmgr: Fix an NULL vs IS_ERR() check in probe
@ 2019-05-03 13:16 Dan Carpenter
  2019-05-04 11:59 ` Linus Walleij
  0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2019-05-03 13:16 UTC (permalink / raw)
  To: Krzysztof Halasa, Linus Walleij; +Cc: linux-kernel, kernel-janitors

The devm_ioremap_resource() function doesn't retunr NULL, it returns
error pointers.

Fixes: ecc133c6da60 ("soc: ixp4xx: qmgr: Pass resources")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
---
 drivers/soc/ixp4xx/ixp4xx-qmgr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/soc/ixp4xx/ixp4xx-qmgr.c b/drivers/soc/ixp4xx/ixp4xx-qmgr.c
index 13a8a13c9b01..bb90670ec160 100644
--- a/drivers/soc/ixp4xx/ixp4xx-qmgr.c
+++ b/drivers/soc/ixp4xx/ixp4xx-qmgr.c
@@ -385,8 +385,8 @@ static int ixp4xx_qmgr_probe(struct platform_device *pdev)
 	if (!res)
 		return -ENODEV;
 	qmgr_regs = devm_ioremap_resource(dev, res);
-	if (!qmgr_regs)
-		return -ENOMEM;
+	if (IS_ERR(qmgr_regs))
+		return PTR_ERR(qmgr_regs);
 
 	irq1 = platform_get_irq(pdev, 0);
 	if (irq1 <= 0)
-- 
2.18.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] soc: ixp4xx: qmgr: Fix an NULL vs IS_ERR() check in probe
  2019-05-03 13:16 [PATCH] soc: ixp4xx: qmgr: Fix an NULL vs IS_ERR() check in probe Dan Carpenter
@ 2019-05-04 11:59 ` Linus Walleij
  0 siblings, 0 replies; 2+ messages in thread
From: Linus Walleij @ 2019-05-04 11:59 UTC (permalink / raw)
  To: Dan Carpenter; +Cc: Krzysztof Halasa, linux-kernel, kernel-janitors

On Fri, May 3, 2019 at 3:17 PM Dan Carpenter <dan.carpenter@oracle.com> wrote:

> The devm_ioremap_resource() function doesn't retunr NULL, it returns
> error pointers.
>
> Fixes: ecc133c6da60 ("soc: ixp4xx: qmgr: Pass resources")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Good catch! Patch applied.

I will make sure this fix lands in ARM SoC for v5.2.

Yours,
Linus Walleij

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2019-05-04 11:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-03 13:16 [PATCH] soc: ixp4xx: qmgr: Fix an NULL vs IS_ERR() check in probe Dan Carpenter
2019-05-04 11:59 ` Linus Walleij

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).