From: Stefan Richter Date: Sun, 29 Oct 2006 22:09:11 +0000 (+0100) Subject: ieee1394: nodemgr: take it easy if bus_rescan_devices fails X-Git-Tag: v2.6.20-rc1~34^2~412^2^2~34 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f72cf5251a8f806a8930ae2cd152aa79fd0de83;p=linux-2.6 ieee1394: nodemgr: take it easy if bus_rescan_devices fails This happens. No need to log a BUG trace. Signed-off-by: Stefan Richter --- diff --git a/drivers/ieee1394/nodemgr.c b/drivers/ieee1394/nodemgr.c index 801f606192..89a4bd4c84 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)