From: Dan Carpenter Date: Fri, 1 Aug 2014 08:53:44 +0000 (+0300) Subject: can: c_can: checking IS_ERR() instead of NULL X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=37b75a3aa8ec7031df75219fe2f8e5e9b7be398f;p=openwrt%2Fstaging%2Fblogic.git can: c_can: checking IS_ERR() instead of NULL devm_ioremap() returns NULL on error, not an ERR_PTR(). Fixes: 33cf75656923 ('can: c_can_platform: Fix raminit, use devm_ioremap() instead of devm_ioremap_resource()') Signed-off-by: Dan Carpenter Cc: linux-stable # >= v3.11 Signed-off-by: Marc Kleine-Budde --- diff --git a/drivers/net/can/c_can/c_can_platform.c b/drivers/net/can/c_can/c_can_platform.c index 5dede6e64376..109cb44291f5 100644 --- a/drivers/net/can/c_can/c_can_platform.c +++ b/drivers/net/can/c_can/c_can_platform.c @@ -280,7 +280,7 @@ static int c_can_plat_probe(struct platform_device *pdev) priv->raminit_ctrlreg = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (IS_ERR(priv->raminit_ctrlreg) || priv->instance < 0) + if (!priv->raminit_ctrlreg || priv->instance < 0) dev_info(&pdev->dev, "control memory is not used for raminit\n"); else priv->raminit = c_can_hw_raminit_ti;