From 4716a551783702ffdefe29a16197a198db0f06e4 Mon Sep 17 00:00:00 2001 From: Stephan Gatzka Date: Mon, 26 Sep 2011 21:44:30 +0200 Subject: [PATCH] --- yaml --- r: 272393 b: refs/heads/master c: a74477db9171e677b7a37b89e6e0ac8a15ba1f26 h: refs/heads/master i: 272391: e1273bcad57bc276f8eb10ab037f0d40c31a84bf v: v3 --- [refs] | 2 +- trunk/drivers/firewire/net.c | 9 ++------- trunk/drivers/firewire/ohci.c | 3 ++- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f0d24df77dad..7799f0996c98 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ec4a67aa100268b4ac5ae32b54843d975969969 +refs/heads/master: a74477db9171e677b7a37b89e6e0ac8a15ba1f26 diff --git a/trunk/drivers/firewire/net.c b/trunk/drivers/firewire/net.c index d1fad1fb17e2..a20f45b1e7e5 100644 --- a/trunk/drivers/firewire/net.c +++ b/trunk/drivers/firewire/net.c @@ -1121,17 +1121,12 @@ static int fwnet_broadcast_start(struct fwnet_device *dev) unsigned u; if (dev->local_fifo == FWNET_NO_FIFO_ADDR) { - /* outside OHCI posted write area? */ - static const struct fw_address_region region = { - .start = 0xffff00000000ULL, - .end = CSR_REGISTER_BASE, - }; - dev->handler.length = 4096; dev->handler.address_callback = fwnet_receive_packet; dev->handler.callback_data = dev; - retval = fw_core_add_address_handler(&dev->handler, ®ion); + retval = fw_core_add_address_handler(&dev->handler, + &fw_high_memory_region); if (retval < 0) goto failed_initial; diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c index 399d5926caf7..bffc2ad7ecab 100644 --- a/trunk/drivers/firewire/ohci.c +++ b/trunk/drivers/firewire/ohci.c @@ -2045,7 +2045,8 @@ static irqreturn_t irq_handler(int irq, void *data) reg_read(ohci, OHCI1394_PostedWriteAddressLo); reg_write(ohci, OHCI1394_IntEventClear, OHCI1394_postedWriteErr); - fw_error("PCI posted write error\n"); + if (printk_ratelimit()) + fw_error("PCI posted write error\n"); } if (unlikely(event & OHCI1394_cycleTooLong)) {