OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
612a94d
)
net/can/mscan: Fix buggy listen only mode setting
author
Wolfgang Grandegger
<wg@grandegger.com>
Mon, 14 Nov 2011 19:30:05 +0000
(14:30 -0500)
committer
David S. Miller
<davem@davemloft.net>
Mon, 14 Nov 2011 19:30:05 +0000
(14:30 -0500)
This patch fixes an issue introduced recently with commit
452448f9283e1939408b397e87974a418825b0a8
.
CC: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Wolfgang Grandegger <wg@grandegger.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/can/mscan/mscan.c
patch
|
blob
|
history
diff --git
a/drivers/net/can/mscan/mscan.c
b/drivers/net/can/mscan/mscan.c
index
74f3b18
..
1c82dd8
100644
(file)
--- a/
drivers/net/can/mscan/mscan.c
+++ b/
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(®s->canctl1, MSCAN_LISTEN);
else
clrbits8(®s->canctl1, MSCAN_LISTEN);