Commit 8d509777 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] irqs: 1394

Update 1394 to the new IRQ API
parent 5396585d
...@@ -2214,7 +2214,7 @@ static void ohci_schedule_iso_tasklets(struct ti_ohci *ohci, ...@@ -2214,7 +2214,7 @@ static void ohci_schedule_iso_tasklets(struct ti_ohci *ohci,
} }
static void ohci_irq_handler(int irq, void *dev_id, static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
struct pt_regs *regs_are_unused) struct pt_regs *regs_are_unused)
{ {
quadlet_t event, node_id; quadlet_t event, node_id;
...@@ -2231,7 +2231,8 @@ static void ohci_irq_handler(int irq, void *dev_id, ...@@ -2231,7 +2231,8 @@ static void ohci_irq_handler(int irq, void *dev_id,
reg_write(ohci, OHCI1394_IntEventClear, event & ~OHCI1394_busReset); reg_write(ohci, OHCI1394_IntEventClear, event & ~OHCI1394_busReset);
spin_unlock_irqrestore(&ohci->event_lock, flags); spin_unlock_irqrestore(&ohci->event_lock, flags);
if (!event) return; if (!event)
return IRQ_HANDLED;
DBGMSG(ohci->id, "IntEvent: %08x", event); DBGMSG(ohci->id, "IntEvent: %08x", event);
...@@ -2462,7 +2463,7 @@ static void ohci_irq_handler(int irq, void *dev_id, ...@@ -2462,7 +2463,7 @@ static void ohci_irq_handler(int irq, void *dev_id,
PRINT(KERN_ERR, ohci->id, "Unhandled interrupt(s) 0x%08x", PRINT(KERN_ERR, ohci->id, "Unhandled interrupt(s) 0x%08x",
event); event);
return; return IRQ_HANDLED;
} }
/* Put the buffer back into the dma context */ /* Put the buffer back into the dma context */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment