Skip to content

L
linux-davinci
Commit e2f8165d authored by Jody McIntyre's avatar Jody McIntyre
Browse files
Options

Signed-off-by: Jody McIntyre <scjody@modernduck.com>

parent 147830f2
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
drivers/ieee1394/ohci1394.c
View file @ e2f8165d
...@@ -572,6 +572,7 @@ static void ohci_initialize(struct ti_ohci *ohci) ...@@ -572,6 +572,7 @@ static void ohci_initialize(struct ti_ohci *ohci)
OHCI1394_reqTxComplete | OHCI1394_reqTxComplete |
OHCI1394_isochRx | OHCI1394_isochRx |
OHCI1394_isochTx | OHCI1394_isochTx |
OHCI1394_postedWriteErr |
OHCI1394_cycleInconsistent); OHCI1394_cycleInconsistent);
/* Enable link */ /* Enable link */
...@@ -2374,7 +2375,10 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id, ...@@ -2374,7 +2375,10 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
event &= ~OHCI1394_unrecoverableError; 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) { if (event & OHCI1394_cycleInconsistent) {
/* We subscribe to the cycleInconsistent event only to /* We subscribe to the cycleInconsistent event only to
* clear the corresponding event bit... otherwise, * clear the corresponding event bit... otherwise,
...@@ -2382,7 +2386,6 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id, ...@@ -2382,7 +2386,6 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
DBGMSG("OHCI1394_cycleInconsistent"); DBGMSG("OHCI1394_cycleInconsistent");
event &= ~OHCI1394_cycleInconsistent; event &= ~OHCI1394_cycleInconsistent;
} }
if (event & OHCI1394_busReset) { if (event & OHCI1394_busReset) {
/* The busReset event bit can't be cleared during the /* The busReset event bit can't be cleared during the
* selfID phase, so we disable busReset interrupts, to * selfID phase, so we disable busReset interrupts, to
...@@ -2426,7 +2429,6 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id, ...@@ -2426,7 +2429,6 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id,
} }
event &= ~OHCI1394_busReset; event &= ~OHCI1394_busReset;
} }
if (event & OHCI1394_reqTxComplete) { if (event & OHCI1394_reqTxComplete) {
struct dma_trm_ctx *d = &ohci->at_req_context; struct dma_trm_ctx *d = &ohci->at_req_context;
DBGMSG("Got reqTxComplete interrupt " DBGMSG("Got reqTxComplete interrupt "
......
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