Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b655f0e9 authored by Wei Yongjun's avatar Wei Yongjun Committed by Marc Kleine-Budde
Browse files

can: ti_hecc: fix return value check in ti_hecc_probe() 



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: dabf54dd ("can: ti_hecc: Convert TI HECC driver to DT only driver")
Signed-off-by: default avatarWei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 5e64ebc1

drivers/net/can/ti_hecc.c

+6 −6
Original line number Diff line number Diff line
@@ -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 */
@@ -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 */
@@ -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);