---

yaml --- r: 171591 b: refs/heads/master c: 68bd742 h: refs/heads/master i: 171589: babb83a 171587: d5d3918 171583: a77d38c v: v3
git-mirror · Nov 17, 2009 · 7db2dfb · 7db2dfb
1 parent 09c648d
commit 7db2dfb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1712fe59415faf23a36c38dbacf18efd4ffe94e0
+refs/heads/master: 68bd7422a2e07a4e5502137cd4bddb8c2774a912
diff --git a/trunk/drivers/net/can/mscan/mscan.c b/trunk/drivers/net/can/mscan/mscan.c
@@ -379,8 +379,10 @@ static int mscan_rx_poll(struct napi_struct *napi, int quota)
 	struct can_frame *frame;
 	u8 canrflg;
 
-	while (npackets < quota && ((canrflg = in_8(&regs->canrflg)) &
-				    (MSCAN_RXF | MSCAN_ERR_IF))) {
+	while (npackets < quota) {
+		canrflg = in_8(&regs->canrflg);
+		if (!(canrflg & (MSCAN_RXF | MSCAN_ERR_IF)))
+			break;
 
 		skb = alloc_can_skb(dev, &frame);
 		if (!skb) {