Skip to content

Commit

Permalink
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
Browse files Browse the repository at this point in the history
  • Loading branch information
Jody McIntyre committed Mar 29, 2006
1 parent 147830f commit e2f8165
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/ieee1394/ohci1394.c
Original file line number Diff line number Diff line change
Expand Up @@ -572,6 +572,7 @@ static void ohci_initialize(struct ti_ohci *ohci)
OHCI1394_reqTxComplete |
OHCI1394_isochRx |
OHCI1394_isochTx |
OHCI1394_postedWriteErr |
OHCI1394_cycleInconsistent);

/* Enable link */
Expand Down Expand Up @@ -2374,15 +2375,17 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,

event &= ~OHCI1394_unrecoverableError;
}

if (event & OHCI1394_postedWriteErr) {
PRINT(KERN_ERR, "physical posted write error");
/* no recovery strategy yet, had to involve protocol drivers */
}
if (event & OHCI1394_cycleInconsistent) {
/* We subscribe to the cycleInconsistent event only to
* clear the corresponding event bit... otherwise,
* isochronous cycleMatch DMA won't work. */
DBGMSG("OHCI1394_cycleInconsistent");
event &= ~OHCI1394_cycleInconsistent;
}

if (event & OHCI1394_busReset) {
/* The busReset event bit can't be cleared during the
* selfID phase, so we disable busReset interrupts, to
Expand Down Expand Up @@ -2426,7 +2429,6 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
}
event &= ~OHCI1394_busReset;
}

if (event & OHCI1394_reqTxComplete) {
struct dma_trm_ctx *d = &ohci->at_req_context;
DBGMSG("Got reqTxComplete interrupt "
Expand Down

0 comments on commit e2f8165

Please sign in to comment.