Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 224119
b: refs/heads/master
c: c389ff8
h: refs/heads/master
i:
  224117: 8e021cf
  224115: 9a8bb64
  224111: 69dd183
v: v3
  • Loading branch information
Joe Perches authored and David S. Miller committed Nov 9, 2010
1 parent 29594e4 commit b7a82df
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c63fdf46ad0a7f8fe3c0252a0e763515617e0ea7
refs/heads/master: c389ff80d4b598f57d56aa807d396d4351cac8a4
2 changes: 1 addition & 1 deletion trunk/drivers/net/can/mscan/mscan.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static int mscan_restart(struct net_device *dev)

priv->can.state = CAN_STATE_ERROR_ACTIVE;
WARN(!(in_8(&regs->canmisc) & MSCAN_BOHOLD),
"bus-off state expected");
"bus-off state expected\n");
out_8(&regs->canmisc, MSCAN_BOHOLD);
/* Re-enable receive interrupts. */
out_8(&regs->canrier, MSCAN_RX_INTS_ENABLE);
Expand Down

0 comments on commit b7a82df

Please sign in to comment.