summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/nodemgr.c
diff options
context:
space:
mode:
authorStefan Richter <stefanr@s5r6.in-berlin.de>2006-10-29 23:09:11 +0100
committerStefan Richter <stefanr@s5r6.in-berlin.de>2006-12-07 21:44:15 +0100
commit1f72cf5251a8f806a8930ae2cd152aa79fd0de83 (patch)
tree1cc1baf3da7be5d18cdf1f083e39148eadc99d38 /drivers/ieee1394/nodemgr.c
parentbfe89d724527c8b1bb1b68b0da1d94907b094094 (diff)
downloadop-kernel-dev-1f72cf5251a8f806a8930ae2cd152aa79fd0de83.zip
op-kernel-dev-1f72cf5251a8f806a8930ae2cd152aa79fd0de83.tar.gz
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>
Diffstat (limited to 'drivers/ieee1394/nodemgr.c')
-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 801f6061..89a4bd4 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)
* just removed. */
if (generation == get_hpsb_generation(host))
- WARN_ON(bus_rescan_devices(&ieee1394_bus_type));
-
- return;
+ if (bus_rescan_devices(&ieee1394_bus_type))
+ HPSB_DEBUG("bus_rescan_devices had an error");
}
static int nodemgr_send_resume_packet(struct hpsb_host *host)
OpenPOWER on IntegriCloud