diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 09:44:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 09:44:09 -0700 |
| commit | 3aee0605a41399063c0ad396f1f4267108f210d3 (patch) | |
| tree | c9e3ce738c3d093dbd861c5a53b63157edd893c2 /drivers/uwb/umc-bus.c | |
| parent | f4c3f03838ae47a92f2d15d48ddf68deae5d7ebb (diff) | |
| parent | 0396c215f301e92677d1e9a064b405e31501dc1d (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb
* 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb:
uwb: avoid radio controller reset loops
uwb: stop uwbd thread if rc->start() fails
uwb: handle radio controller events with out-of-range IDs correctly
Diffstat (limited to 'drivers/uwb/umc-bus.c')
| -rw-r--r-- | drivers/uwb/umc-bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/umc-bus.c b/drivers/uwb/umc-bus.c index 5ad36164c13..cdd6c8efc9f 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; |