From ec3f8af3fdb5dc4f6320f06d8dcb73e2950cab50 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Thu, 22 Jan 2015 21:48:07 +0800 Subject: [PATCH] MLK-10131 flexcan: fix wakeup unwork issue Original code will always disable flexcan during suspend no matter whether wakeup feature is enabled. It's caused by merge issue when doing kernel upgrade. Fix it by removing that disable code. Signed-off-by: Dong Aisheng (cherry picked from commit 55c8670332973d3184816d3d16c2c3e07681c781) --- drivers/net/can/flexcan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 6cc0590ae833..d996e71a43c1 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c @@ -1394,7 +1394,7 @@ static int __maybe_unused flexcan_suspend(struct device *device) err = flexcan_chip_disable(priv); } } else { - flexcan_chip_disable(priv); + err = flexcan_chip_disable(priv); } priv->can.state = CAN_STATE_SLEEPING; -- 2.17.1