Skip to content

Commit 37b75a3

Browse files
Dan Carpentermarckleinebudde
authored andcommitted
can: c_can: checking IS_ERR() instead of NULL
devm_ioremap() returns NULL on error, not an ERR_PTR(). Fixes: 33cf756 ('can: c_can_platform: Fix raminit, use devm_ioremap() instead of devm_ioremap_resource()') Signed-off-by: Dan Carpenter <[email protected]> Cc: linux-stable <[email protected]> # >= v3.11 Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent 9e37bc6 commit 37b75a3

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/net/can/c_can/c_can_platform.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ static int c_can_plat_probe(struct platform_device *pdev)
280280

281281
priv->raminit_ctrlreg = devm_ioremap(&pdev->dev, res->start,
282282
resource_size(res));
283-
if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0)
283+
if (!priv->raminit_ctrlreg || priv->instance < 0)
284284
dev_info(&pdev->dev, "control memory is not used for raminit\n");
285285
else
286286
priv->raminit = c_can_hw_raminit_ti;

0 commit comments

Comments
 (0)