---

yaml --- r: 294123 b: refs/heads/master c: 98466cc h: refs/heads/master i: 294121: 47144f7 294119: 490001b v: v3
git-mirror · Mar 10, 2012 · f1cb014 · f1cb014
1 parent 46e3c46
commit f1cb014
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c13ccfcf66b2e70f8d01f7fe7e1e20ba60e733e1
+refs/heads/master: 98466cc4502b3171f1bdc146db0d2106fcbc3f4f
diff --git a/trunk/drivers/firewire/core-topology.c b/trunk/drivers/firewire/core-topology.c
@@ -530,7 +530,6 @@ void fw_core_handle_bus_reset(struct fw_card *card, int node_id, int generation,
 	 */
 	if (!is_next_generation(generation, card->generation) &&
 	    card->local_node != NULL) {
-		fw_notice(card, "skipped bus generations, destroying all nodes\n");
 		fw_destroy_nodes(card);
 		card->bm_retries = 0;
 	}

diff --git a/trunk/drivers/firewire/ohci.c b/trunk/drivers/firewire/ohci.c
@@ -2076,8 +2076,7 @@ static irqreturn_t irq_handler(int irq, void *data)
 	}
 
 	if (unlikely(event & OHCI1394_regAccessFail))
-		dev_err(ohci->card.device,
-			"register access failure - please notify linux1394-devel@lists.sf.net\n");
+		dev_err(ohci->card.device, "register access failure\n");
 
 	if (unlikely(event & OHCI1394_postedWriteErr)) {
 		reg_read(ohci, OHCI1394_PostedWriteAddressHi);