---

yaml --- r: 255351 b: refs/heads/master c: 5613fff h: refs/heads/master i: 255349: 0632e63 255347: aef7552 255343: 64c5b37 v: v3
git-mirror · Jun 6, 2011 · 7cbc909 · 7cbc909
1 parent 2d5c0c7
commit 7cbc909
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44d856665789288859b7aa47ca25933c1c6ab57d
+refs/heads/master: 5613fff2dc315e5f44623031cb62a29942548427
diff --git a/trunk/drivers/net/can/at91_can.c b/trunk/drivers/net/can/at91_can.c
@@ -375,7 +375,7 @@ static void at91_chip_stop(struct net_device *dev, enum can_state state)
  * mailbox, but without the offset AT91_MB_TX_FIRST. The lower bits
  * encode the mailbox number, the upper 4 bits the mailbox priority:
  *
- * priv->tx_next = (prio << AT91_NEXT_PRIO_SHIFT) ||
+ * priv->tx_next = (prio << AT91_NEXT_PRIO_SHIFT) |
  *                 (mb - AT91_MB_TX_FIRST);
  *
  */