aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firewire
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/firewire')
-rw-r--r--drivers/firewire/core-topology.c1
-rw-r--r--drivers/firewire/ohci.c3
2 files changed, 1 insertions, 3 deletions
diff --git a/drivers/firewire/core-topology.c b/drivers/firewire/core-topology.c
index 75a6b0df670a..255646ffc352 100644
--- a/drivers/firewire/core-topology.c
+++ b/drivers/firewire/core-topology.c
@@ -530,7 +530,6 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation,
530 */ 530 */
531 if (!is_next_generation(generation, card->generation) && 531 if (!is_next_generation(generation, card->generation) &&
532 card->local_node != NULL) { 532 card->local_node != NULL) {
533 fw_notice(card, "skipped bus generations, destroying all nodes\n");
534 fw_destroy_nodes(card); 533 fw_destroy_nodes(card);
535 card->bm_retries = 0; 534 card->bm_retries = 0;
536 } 535 }
diff --git a/drivers/firewire/ohci.c b/drivers/firewire/ohci.c
index 68b3c1b635f6..ee235b537774 100644
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
@@ -2076,8 +2076,7 @@ static irqreturn_t irq_handler(int irq, void *data)
2076 } 2076 }
2077 2077
2078 if (unlikely(event & OHCI1394_regAccessFail)) 2078 if (unlikely(event & OHCI1394_regAccessFail))
2079 dev_err(ohci->card.device, 2079 dev_err(ohci->card.device, "register access failure\n");
2080 "register access failure - please notify linux1394-devel@lists.sf.net\n");
2081 2080
2082 if (unlikely(event & OHCI1394_postedWriteErr)) { 2081 if (unlikely(event & OHCI1394_postedWriteErr)) {
2083 reg_read(ohci, OHCI1394_PostedWriteAddressHi); 2082 reg_read(ohci, OHCI1394_PostedWriteAddressHi);