From 3b9d616f89630c2fc2903e02ce66ab988e0b07c0 Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Mon, 16 Nov 2009 12:57:46 +0000
Subject: [PATCH] --- yaml --- r: 171588 b: refs/heads/master c:
 377a1f0b92819697aa1792f171c305a681fcca5a h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/can/mscan/mscan.c | 8 --------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index ffe03b237f13..69db912bd6b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0285e7ceaaec9ef2d2e74dd37e2b557c0e017b5c
+refs/heads/master: 377a1f0b92819697aa1792f171c305a681fcca5a
diff --git a/trunk/drivers/net/can/mscan/mscan.c b/trunk/drivers/net/can/mscan/mscan.c
index 6394de840427..839b471cdf5d 100644
--- a/trunk/drivers/net/can/mscan/mscan.c
+++ b/trunk/drivers/net/can/mscan/mscan.c
@@ -487,14 +487,6 @@ static int mscan_do_set_mode(struct net_device *dev, enum can_mode mode)
 		return -EINVAL;
 
 	switch (mode) {
-	case CAN_MODE_SLEEP:
-	case CAN_MODE_STOP:
-		netif_stop_queue(dev);
-		mscan_set_mode(dev,
-			       (mode ==
-				CAN_MODE_STOP) ? MSCAN_INIT_MODE :
-			       MSCAN_SLEEP_MODE);
-		break;
 	case CAN_MODE_START:
 		if (priv->can.state <= CAN_STATE_BUS_OFF)
 			mscan_set_mode(dev, MSCAN_INIT_MODE);