From: Stefan Richter <stefanr@s5r6.in-berlin.de>
Date: Sat, 9 Jun 2007 17:31:14 +0000 (+0200)
Subject: firewire: fix hang after card ejection
X-Git-Tag: v2.6.22-rc6~69^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a515958d6f77fdff1a40f8b08a9a95ac223c5d48;p=linux-2.6-omap-h63xx.git

firewire: fix hang after card ejection

Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Kristian Høgsberg <krh@redhat.com>
---

diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c
index 0d08bf9b78c..b72a5c1f9e6 100644
--- a/drivers/firewire/fw-ohci.c
+++ b/drivers/firewire/fw-ohci.c
@@ -1001,7 +1001,7 @@ static irqreturn_t irq_handler(int irq, void *data)
 
 	event = reg_read(ohci, OHCI1394_IntEventClear);
 
-	if (!event)
+	if (!event || !~event)
 		return IRQ_NONE;
 
 	reg_write(ohci, OHCI1394_IntEventClear, event);