diff options
| author | Jody McIntyre | 2006-03-29 02:55:11 +0200 |
|---|---|---|
| committer | Jody McIntyre | 2006-03-29 02:55:11 +0200 |
| commit | e2f8165dc3c70cd74bcf2c63a6c0de254c6ff50c (patch) | |
| tree | ce7c0f0af9e21de680c283f1ac8fbc9773f75571 /drivers/ieee1394 | |
| parent | sbp2: prevent unloading of 1394 low-level driver (diff) | |
| download | kernel-qcow2-linux-e2f8165dc3c70cd74bcf2c63a6c0de254c6ff50c.tar.gz kernel-qcow2-linux-e2f8165dc3c70cd74bcf2c63a6c0de254c6ff50c.tar.xz kernel-qcow2-linux-e2f8165dc3c70cd74bcf2c63a6c0de254c6ff50c.zip | |
Signed-off-by: Jody McIntyre <scjody@modernduck.com>
Diffstat (limited to 'drivers/ieee1394')
| -rw-r--r-- | drivers/ieee1394/ohci1394.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/ieee1394/ohci1394.c b/drivers/ieee1394/ohci1394.c index b6b96fa04d62..eb329a875099 100644 --- a/drivers/ieee1394/ohci1394.c +++ b/drivers/ieee1394/ohci1394.c @@ -572,6 +572,7 @@ static void ohci_initialize(struct ti_ohci *ohci) OHCI1394_reqTxComplete | OHCI1394_isochRx | OHCI1394_isochTx | + OHCI1394_postedWriteErr | OHCI1394_cycleInconsistent); /* Enable link */ @@ -2374,7 +2375,10 @@ 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, @@ -2382,7 +2386,6 @@ static irqreturn_t ohci_irq_handler(int irq, void *dev_id, 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 @@ -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 " |