diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/firewire/fw-ohci.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/firewire/fw-ohci.c b/drivers/firewire/fw-ohci.c index c16fcb96f272..a33374825526 100644 --- a/drivers/firewire/fw-ohci.c +++ b/drivers/firewire/fw-ohci.c | |||
@@ -18,6 +18,7 @@ | |||
18 | * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | 18 | * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. |
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/compiler.h> | ||
21 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
22 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
23 | #include <linux/gfp.h> | 24 | #include <linux/gfp.h> |
@@ -1049,6 +1050,9 @@ static irqreturn_t irq_handler(int irq, void *data) | |||
1049 | iso_event &= ~(1 << i); | 1050 | iso_event &= ~(1 << i); |
1050 | } | 1051 | } |
1051 | 1052 | ||
1053 | if (unlikely(event & OHCI1394_postedWriteErr)) | ||
1054 | fw_error("PCI posted write error\n"); | ||
1055 | |||
1052 | if (event & OHCI1394_cycle64Seconds) { | 1056 | if (event & OHCI1394_cycle64Seconds) { |
1053 | cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer); | 1057 | cycle_time = reg_read(ohci, OHCI1394_IsochronousCycleTimer); |
1054 | if ((cycle_time & 0x80000000) == 0) | 1058 | if ((cycle_time & 0x80000000) == 0) |
@@ -1122,8 +1126,8 @@ static int ohci_enable(struct fw_card *card, u32 *config_rom, size_t length) | |||
1122 | OHCI1394_RQPkt | OHCI1394_RSPkt | | 1126 | OHCI1394_RQPkt | OHCI1394_RSPkt | |
1123 | OHCI1394_reqTxComplete | OHCI1394_respTxComplete | | 1127 | OHCI1394_reqTxComplete | OHCI1394_respTxComplete | |
1124 | OHCI1394_isochRx | OHCI1394_isochTx | | 1128 | OHCI1394_isochRx | OHCI1394_isochTx | |
1125 | OHCI1394_masterIntEnable | | 1129 | OHCI1394_postedWriteErr | OHCI1394_cycle64Seconds | |
1126 | OHCI1394_cycle64Seconds); | 1130 | OHCI1394_masterIntEnable); |
1127 | 1131 | ||
1128 | /* Activate link_on bit and contender bit in our self ID packets.*/ | 1132 | /* Activate link_on bit and contender bit in our self ID packets.*/ |
1129 | if (ohci_update_phy_reg(card, 4, 0, | 1133 | if (ohci_update_phy_reg(card, 4, 0, |