From 061959d4fb0c45f07a880125cbaf1a398bc941c1 Mon Sep 17 00:00:00 2001
From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue, 28 Sep 2010 10:00:47 +0200
Subject: [PATCH] --- yaml --- r: 215211 b: refs/heads/master c:
 7e15de3a73899903f33975b1ce57cf59c616d1d9 h: refs/heads/master i:   215209:
 bd410a4ac634faa58b58e7d8d0e4501a4254c5f3   215207:
 41c85aa9b980d7781e0470be53d98bb8fe3afa83 v: v3

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

diff --git a/[refs] b/[refs]
index 397664a3a1ab..4c36ebfafbee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3a3ed3115d39463dc6672454bfbeaff46811a37
+refs/heads/master: 7e15de3a73899903f33975b1ce57cf59c616d1d9
diff --git a/trunk/drivers/net/can/mcp251x.c b/trunk/drivers/net/can/mcp251x.c
index 9b3466aed06d..7e2f951002a5 100644
--- a/trunk/drivers/net/can/mcp251x.c
+++ b/trunk/drivers/net/can/mcp251x.c
@@ -785,7 +785,8 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id)
 
 		mcp251x_write_bits(spi, CANINTF, intf, 0x00);
 
-		mcp251x_write_reg(spi, EFLG, 0x00);
+		if (eflag)
+			mcp251x_write_bits(spi, EFLG, eflag, 0x00);
 
 		/* Update can state */
 		if (eflag & EFLG_TXBO) {