summaryrefslogtreecommitdiffstats
path: root/drivers/net/can
diff options
context:
space:
mode:
authorWolfgang Grandegger <wg@grandegger.com>2011-11-14 20:30:05 +0100
committerDavid S. Miller <davem@davemloft.net>2011-11-14 20:30:05 +0100
commitabbd00b82a2771b0460ba2cffdb1343aa827ccde (patch)
treea90d2c5f10d362e47cee8e6f193a23a179451137 /drivers/net/can
parentSweep the last of the active .get_drvinfo floors under ethernet/ (diff)
downloadlinux-abbd00b82a2771b0460ba2cffdb1343aa827ccde.tar.xz
linux-abbd00b82a2771b0460ba2cffdb1343aa827ccde.zip
net/can/mscan: Fix buggy listen only mode setting
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>
Diffstat (limited to 'drivers/net/can')
-rw-r--r--drivers/net/can/mscan/mscan.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c
index 74f3b1829e02..1c82dd8b896e 100644
--- 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(&regs->canctl1, MSCAN_LISTEN);
else
clrbits8(&regs->canctl1, MSCAN_LISTEN);