From 7db2dfb21ca013abc4e081d9c31a17caea9a8cdd Mon Sep 17 00:00:00 2001
From: Wolfram Sang <w.sang@pengutronix.de>
Date: Mon, 16 Nov 2009 12:57:49 +0000
Subject: [PATCH] --- yaml --- r: 171591 b: refs/heads/master c:
 68bd7422a2e07a4e5502137cd4bddb8c2774a912 h: refs/heads/master i:   171589:
 babb83ad20072aed53f44e30b1a0536897c747c0   171587:
 d5d391880cceeff7b897475886edcd66fb12366e   171583:
 a77d38c2d9ba077515ca2bdd3a1b1e1aa87b0a87 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/net/can/mscan/mscan.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ef172c57d2f9..3601333dde19 100644
--- 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
index 76e413e7fdb1..20d1991b9094 100644
--- 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) {