Skip to content

Commit

Permalink
can: ti_hecc: fix return value check in ti_hecc_probe()
Browse files Browse the repository at this point in the history
In case of error, the function devm_ioremap_resource() returns ERR_PTR()
and never returns NULL. The NULL test in the return value check should
be replaced with IS_ERR().

Fixes: dabf54d ("can: ti_hecc: Convert TI HECC driver to DT only driver")
Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Wei Yongjun authored and Marc Kleine-Budde committed Apr 25, 2017
1 parent 5e64ebc commit b655f0e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions drivers/net/can/ti_hecc.c
Original file line number Diff line number Diff line change
Expand Up @@ -898,9 +898,9 @@ static int ti_hecc_probe(struct platform_device *pdev)
}

priv->base = devm_ioremap_resource(&pdev->dev, res);
if (!priv->base) {
if (IS_ERR(priv->base)) {
dev_err(&pdev->dev, "hecc ioremap failed\n");
return -ENOMEM;
return PTR_ERR(priv->base);
}

/* handle hecc-ram memory */
Expand All @@ -911,9 +911,9 @@ static int ti_hecc_probe(struct platform_device *pdev)
}

priv->hecc_ram = devm_ioremap_resource(&pdev->dev, res);
if (!priv->hecc_ram) {
if (IS_ERR(priv->hecc_ram)) {
dev_err(&pdev->dev, "hecc-ram ioremap failed\n");
return -ENOMEM;
return PTR_ERR(priv->hecc_ram);
}

/* handle mbx memory */
Expand All @@ -924,9 +924,9 @@ static int ti_hecc_probe(struct platform_device *pdev)
}

priv->mbx = devm_ioremap_resource(&pdev->dev, res);
if (!priv->mbx) {
if (IS_ERR(priv->mbx)) {
dev_err(&pdev->dev, "mbx ioremap failed\n");
return -ENOMEM;
return PTR_ERR(priv->mbx);
}

irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
Expand Down

0 comments on commit b655f0e

Please sign in to comment.