MLK-10131 flexcan: fix wakeup unwork issue

Dong Aisheng · Nitin Garg · commit 55c867033297 · 2015-09-17T09:21:14.000-05:00
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 &lt;b29396@freescale.com&gt;
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
@@ -1323,11 +1323,7 @@ static int flexcan_suspend(struct device *device)
 {
 	struct net_device *dev = dev_get_drvdata(device);
 	struct flexcan_priv *priv = netdev_priv(dev);
-	int err;
-
-	err = flexcan_chip_disable(priv);
-	if (err)
-		return err;
+	int err = 0;
 
 	if (netif_running(dev)) {
 		netif_stop_queue(dev);
@@ -1340,20 +1336,21 @@ static int flexcan_suspend(struct device *device)
 			enable_irq_wake(dev->irq);
 			flexcan_enter_stop_mode(priv);
 		} else {
-			flexcan_chip_disable(priv);
+			err = flexcan_chip_disable(priv);
 		}
 	} else {
-		flexcan_chip_disable(priv);
+		err = flexcan_chip_disable(priv);
 	}
 	priv->can.state = CAN_STATE_SLEEPING;
 
-	return 0;
+	return err;
 }
 
 static int flexcan_resume(struct device *device)
 {
 	struct net_device *dev = dev_get_drvdata(device);
 	struct flexcan_priv *priv = netdev_priv(dev);
+	int err = 0;
 
 	priv->can.state = CAN_STATE_ERROR_ACTIVE;
 	if (netif_running(dev)) {
@@ -1364,13 +1361,13 @@ static int flexcan_resume(struct device *device)
 			disable_irq_wake(dev->irq);
 			flexcan_exit_stop_mode(priv);
 		} else {
-			flexcan_chip_enable(priv);
+			err = flexcan_chip_enable(priv);
 		}
 	} else {
-		flexcan_chip_enable(priv);
+		err = flexcan_chip_enable(priv);
 	}
 
-	return 0;
+	return err;
 }
 #endif /* CONFIG_PM_SLEEP */
 
