---

yaml --- r: 277539 b: refs/heads/master c: abbd00b h: refs/heads/master i: 277537: 3bbf5d3 277535: 55b98b4 v: v3
git-mirror · Nov 14, 2011 · 90189f9 · 90189f9
1 parent 3dec574
commit 90189f9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);