summaryrefslogtreecommitdiffstats
path: root/drivers/uwb/umc-bus.c
diff options
context:
space:
mode:
authorDavid Vrabel <david.vrabel@csr.com>2009-08-25 16:41:06 +0100
committerDavid Vrabel <david.vrabel@csr.com>2009-08-26 12:39:29 +0100
commit0396c215f301e92677d1e9a064b405e31501dc1d (patch)
treea54229672abc6f244fcf184701b8a8bf98b70544 /drivers/uwb/umc-bus.c
parenta9e75a389254801ca160b72c6e221e5bb7e35df9 (diff)
downloadlinux-stable-0396c215f301e92677d1e9a064b405e31501dc1d.tar.gz
linux-stable-0396c215f301e92677d1e9a064b405e31501dc1d.tar.bz2
linux-stable-0396c215f301e92677d1e9a064b405e31501dc1d.zip
uwb: avoid radio controller reset loops
If a radio controller reset attempt occurs while a probe() or remove() is in progress it fails and is retried endlessly, potentially preventing the probe() or remove() from completing. If a reset fails, sleep for a bit before retrying the reset. This allows the probe()/remove() to complete. Signed-off-by: David Vrabel <david.vrabel@csr.com>
Diffstat (limited to 'drivers/uwb/umc-bus.c')
-rw-r--r--drivers/uwb/umc-bus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c
index 5ad36164c13b..cdd6c8efc9f8 100644
--- a/drivers/uwb/umc-bus.c
+++ b/drivers/uwb/umc-bus.c
@@ -66,7 +66,7 @@ int umc_controller_reset(struct umc_dev *umc)
return -EAGAIN;
ret = device_for_each_child(parent, parent, umc_bus_pre_reset_helper);
if (ret >= 0)
- device_for_each_child(parent, parent, umc_bus_post_reset_helper);
+ ret = device_for_each_child(parent, parent, umc_bus_post_reset_helper);
up(&parent->sem);
return ret;