From 3407bddd3f1dc911a0dbb0ad7f89c2c30bc2de21 Mon Sep 17 00:00:00 2001 From: Stefan Richter Date: Sun, 29 Oct 2006 23:09:11 +0100 Subject: [PATCH] --- yaml --- r: 43441 b: refs/heads/master c: 1f72cf5251a8f806a8930ae2cd152aa79fd0de83 h: refs/heads/master i: 43439: 383c149e35d8ef759d46a97ea2d683ff356b89a9 v: v3 --- [refs] | 2 +- trunk/drivers/ieee1394/nodemgr.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 7205537a9bba..9df042fdcdec 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bfe89d724527c8b1bb1b68b0da1d94907b094094 +refs/heads/master: 1f72cf5251a8f806a8930ae2cd152aa79fd0de83 diff --git a/trunk/drivers/ieee1394/nodemgr.c b/trunk/drivers/ieee1394/nodemgr.c index 801f60619236..89a4bd4c842d 100644 --- a/trunk/drivers/ieee1394/nodemgr.c +++ b/trunk/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)