Skip to content

Commit

Permalink
net: macb: Fix runtime PM refcounting
Browse files Browse the repository at this point in the history
The commit e6a41c2, while trying to fix an issue,

    ("net: macb: ensure interface is not suspended on at91rm9200")

introduced a refcounting regression, because in error case refcounter
must be balanced. Fix it by calling pm_runtime_put_noidle() in error case.

While here, fix the same mistake in other couple of places.

Fixes: e6a41c2 ("net: macb: ensure interface is not suspended on at91rm9200")
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
Cc: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Andy Shevchenko authored and David S. Miller committed May 1, 2020
1 parent ee8d226 commit 0ce205d
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions drivers/net/ethernet/cadence/macb_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,10 @@ static int macb_mdio_read(struct mii_bus *bus, int mii_id, int regnum)
int status;

status = pm_runtime_get_sync(&bp->pdev->dev);
if (status < 0)
if (status < 0) {
pm_runtime_put_noidle(&bp->pdev->dev);
goto mdio_pm_exit;
}

status = macb_mdio_wait_for_idle(bp);
if (status < 0)
Expand Down Expand Up @@ -386,8 +388,10 @@ static int macb_mdio_write(struct mii_bus *bus, int mii_id, int regnum,
int status;

status = pm_runtime_get_sync(&bp->pdev->dev);
if (status < 0)
if (status < 0) {
pm_runtime_put_noidle(&bp->pdev->dev);
goto mdio_pm_exit;
}

status = macb_mdio_wait_for_idle(bp);
if (status < 0)
Expand Down Expand Up @@ -3816,8 +3820,10 @@ static int at91ether_open(struct net_device *dev)
int ret;

ret = pm_runtime_get_sync(&lp->pdev->dev);
if (ret < 0)
if (ret < 0) {
pm_runtime_put_noidle(&lp->pdev->dev);
return ret;
}

/* Clear internal statistics */
ctl = macb_readl(lp, NCR);
Expand Down

0 comments on commit 0ce205d

Please sign in to comment.