diff options
Diffstat (limited to 'drivers/net/can/mscan/mscan.c')
-rw-r--r-- | drivers/net/can/mscan/mscan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/mscan/mscan.c b/drivers/net/can/mscan/mscan.c index 64c378cd0c34..92feac68b66e 100644 --- a/drivers/net/can/mscan/mscan.c +++ b/drivers/net/can/mscan/mscan.c | |||
@@ -182,7 +182,7 @@ static int mscan_restart(struct net_device *dev) | |||
182 | 182 | ||
183 | priv->can.state = CAN_STATE_ERROR_ACTIVE; | 183 | priv->can.state = CAN_STATE_ERROR_ACTIVE; |
184 | WARN(!(in_8(®s->canmisc) & MSCAN_BOHOLD), | 184 | WARN(!(in_8(®s->canmisc) & MSCAN_BOHOLD), |
185 | "bus-off state expected"); | 185 | "bus-off state expected\n"); |
186 | out_8(®s->canmisc, MSCAN_BOHOLD); | 186 | out_8(®s->canmisc, MSCAN_BOHOLD); |
187 | /* Re-enable receive interrupts. */ | 187 | /* Re-enable receive interrupts. */ |
188 | out_8(®s->canrier, MSCAN_RX_INTS_ENABLE); | 188 | out_8(®s->canrier, MSCAN_RX_INTS_ENABLE); |
@@ -246,7 +246,7 @@ static netdev_tx_t mscan_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
246 | out_be16(®s->tx.idr3_2, can_id); | 246 | out_be16(®s->tx.idr3_2, can_id); |
247 | 247 | ||
248 | can_id >>= 16; | 248 | can_id >>= 16; |
249 | /* EFF_FLAGS are inbetween the IDs :( */ | 249 | /* EFF_FLAGS are between the IDs :( */ |
250 | can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0) | 250 | can_id = (can_id & 0x7) | ((can_id << 2) & 0xffe0) |
251 | | MSCAN_EFF_FLAGS; | 251 | | MSCAN_EFF_FLAGS; |
252 | } else { | 252 | } else { |