aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-10-29 17:09:11 -0500
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-12-07 15:44:15 -0500
commit1f72cf5251a8f806a8930ae2cd152aa79fd0de83 (patch)
tree1cc1baf3da7be5d18cdf1f083e39148eadc99d38
parentbfe89d724527c8b1bb1b68b0da1d94907b094094 (diff)
ieee1394: nodemgr: take it easy if bus_rescan_devices fails
This happens. No need to log a BUG trace. Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
-rw-r--r--drivers/ieee1394/nodemgr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c
index 801f60619236..89a4bd4c842d 100644
--- a/drivers/ieee1394/nodemgr.c
+++ b/drivers/ieee1394/nodemgr.c
@@ -1600,9 +1600,8 @@ static void nodemgr_node_probe(struct host_info *hi, int generation)
1600 * just removed. */ 1600 * just removed. */
1601 1601
1602 if (generation == get_hpsb_generation(host)) 1602 if (generation == get_hpsb_generation(host))
1603 WARN_ON(bus_rescan_devices(&ieee1394_bus_type)); 1603 if (bus_rescan_devices(&ieee1394_bus_type))
1604 1604 HPSB_DEBUG("bus_rescan_devices had an error");
1605 return;
1606} 1605}
1607 1606
1608static int nodemgr_send_resume_packet(struct hpsb_host *host) 1607static int nodemgr_send_resume_packet(struct hpsb_host *host)