diff options
| author | David S. Miller | 2016-09-21 04:46:14 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-09-21 04:46:14 +0200 |
| commit | ceb16a90136f42a0079b12d163c824b5825933f7 (patch) | |
| tree | 66203a8fc28e7df795c26cedae5e3e49eb160d47 | |
| parent | qed: Fix stack corruption on probe (diff) | |
| parent | can: flexcan: fix resume function (diff) | |
| download | kernel-qcow2-linux-ceb16a90136f42a0079b12d163c824b5825933f7.tar.gz kernel-qcow2-linux-ceb16a90136f42a0079b12d163c824b5825933f7.tar.xz kernel-qcow2-linux-ceb16a90136f42a0079b12d163c824b5825933f7.zip | |
Merge tag 'linux-can-fixes-for-4.8-20160919' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can
Marc Kleine-Budde says:
====================
pull-request: can 2016-09-19
this is a pull request of one patch for the upcoming linux-4.8 release.
The patch by Fabio Estevam fixes the pm handling in the flexcan driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/can/flexcan.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 41c0fc9f3b14..16f7cadda5c3 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -1268,11 +1268,10 @@ static int __maybe_unused flexcan_suspend(struct device *device) struct flexcan_priv *priv = netdev_priv(dev); int err; - err = flexcan_chip_disable(priv); - if (err) - return err; - if (netif_running(dev)) { + err = flexcan_chip_disable(priv); + if (err) + return err; netif_stop_queue(dev); netif_device_detach(dev); } @@ -1285,13 +1284,17 @@ static int __maybe_unused flexcan_resume(struct device *device) { struct net_device *dev = dev_get_drvdata(device); struct flexcan_priv *priv = netdev_priv(dev); + int err; priv->can.state = CAN_STATE_ERROR_ACTIVE; if (netif_running(dev)) { netif_device_attach(dev); netif_start_queue(dev); + err = flexcan_chip_enable(priv); + if (err) + return err; } - return flexcan_chip_enable(priv); + return 0; } static SIMPLE_DEV_PM_OPS(flexcan_pm_ops, flexcan_suspend, flexcan_resume); |