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(®s->canctl1, MSCAN_LISTEN); else clrbits8(®s->canctl1, MSCAN_LISTEN);