From 90189f932f83c5d5171340c249a3893fd8d5ecc2 Mon Sep 17 00:00:00 2001
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Mon, 14 Nov 2011 14:30:05 -0500
Subject: [PATCH] --- yaml --- r: 277539 b: refs/heads/master c:
 abbd00b82a2771b0460ba2cffdb1343aa827ccde h: refs/heads/master i:   277537:
 3bbf5d3edd0e5022551f1e084ed86cb2851293f5   277535:
 55b98b4d1a6794fc30903c6b069e3ec3aa9699f5 v: v3

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

diff --git a/[refs] b/[refs]
index 4266d2da8bb4..9e205ec251af 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 612a94d6f24eb2427eabf554392080302da664dd
+refs/heads/master: abbd00b82a2771b0460ba2cffdb1343aa827ccde
diff --git a/trunk/drivers/net/can/mscan/mscan.c b/trunk/drivers/net/can/mscan/mscan.c
index 74f3b1829e02..1c82dd8b896e 100644
--- a/trunk/drivers/net/can/mscan/mscan.c
+++ b/trunk/drivers/net/can/mscan/mscan.c
@@ -581,7 +581,7 @@ static int mscan_open(struct net_device *dev)
 
 	priv->open_time = jiffies;
 
-	if (ctrlmode.flags & CAN_CTRLMODE_LISTENONLY)
+	if (priv->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)
 		setbits8(&regs->canctl1, MSCAN_LISTEN);
 	else
 		clrbits8(&regs->canctl1, MSCAN_LISTEN);