Commit 79c43333 authored by Navid Emamdoost's avatar Navid Emamdoost Committed by Marc Kleine-Budde
Browse files

can: xilinx_can: handle failure cases of pm_runtime_get_sync 



Calling pm_runtime_get_sync increments the counter even in case of
failure, causing incorrect ref count. Call pm_runtime_put if
pm_runtime_get_sync fails.

Signed-off-by: default avatarNavid Emamdoost <navid.emamdoost@gmail.com>
Link: https://lore.kernel.org/r/20200605033239.60664-1-navid.emamdoost@gmail.com


Fixes: 4716620d ("can: xilinx: Convert to runtime_pm")
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent e002103b

drivers/net/can/xilinx_can.c

+3 −3
Original line number Diff line number Diff line
@@ -1395,7 +1395,7 @@ static int xcan_open(struct net_device *ndev) 
	if (ret < 0) {

		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",

			   __func__, ret);

		return ret;

		goto err;

	}



	ret = request_irq(ndev->irq, xcan_interrupt, priv->irq_flags,
@@ -1479,6 +1479,7 @@ static int xcan_get_berr_counter(const struct net_device *ndev, 
	if (ret < 0) {

		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",

			   __func__, ret);

		pm_runtime_put(priv->dev);

		return ret;

	}
@@ -1793,7 +1794,7 @@ static int xcan_probe(struct platform_device *pdev) 
	if (ret < 0) {

		netdev_err(ndev, "%s: pm_runtime_get failed(%d)\n",

			   __func__, ret);

		goto err_pmdisable;

		goto err_disableclks;

	}



	if (priv->read_reg(priv, XCAN_SR_OFFSET) != XCAN_SR_CONFIG_MASK) {
@@ -1828,7 +1829,6 @@ static int xcan_probe(struct platform_device *pdev) 


err_disableclks:

	pm_runtime_put(priv->dev);

err_pmdisable:

	pm_runtime_disable(&pdev->dev);

err_free:

	free_candev(ndev);