Message ID | 4EC11900.7030005@grandegger.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Wolfgang Grandegger <wg@grandegger.com> Date: Mon, 14 Nov 2011 14:34:56 +0100 > 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> Applied, thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c index 74f3b18..1c82dd8 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(®s->canctl1, MSCAN_LISTEN); else clrbits8(®s->canctl1, MSCAN_LISTEN);
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> --- drivers/net/can/mscan/mscan.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)