From: Dong Aisheng <b29396@freescale.com>
Date: Thu, 22 Jan 2015 13:48:07 +0000 (+0800)
Subject: MLK-10131 flexcan: fix wakeup unwork issue
X-Git-Tag: C0P2-H0.0--20200415~4129
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=ec3f8af3fdb5dc4f6320f06d8dcb73e2950cab50;p=linux.git

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 <b29396@freescale.com>
(cherry picked from commit 55c8670332973d3184816d3d16c2c3e07681c781)
---

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;