summaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2007-06-09 19:31:14 +0200
committerStefan Richter <stefanr@s5r6.in-berlin.de>2007-06-16 12:43:20 +0200
commita515958d6f77fdff1a40f8b08a9a95ac223c5d48 (patch)
tree24204825fc5c37e4ee38c0755cb8441ed2c192e8 /drivers/firewire
parentde7f928ca460005086a8296be07c217aac4b625d (diff)
downloadkernel-crypto-a515958d6f77fdff1a40f8b08a9a95ac223c5d48.tar.gz
kernel-crypto-a515958d6f77fdff1a40f8b08a9a95ac223c5d48.tar.xz
kernel-crypto-a515958d6f77fdff1a40f8b08a9a95ac223c5d48.zip
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>
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/fw-ohci.c2
1 files changed, 1 insertions, 1 deletions
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);