diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 18:44:09 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 18:44:09 +0200 |
commit | 3aee0605a41399063c0ad396f1f4267108f210d3 (patch) | |
tree | c9e3ce738c3d093dbd861c5a53b63157edd893c2 /drivers/uwb/whc-rc.c | |
parent | Fix ia64 build breakage in head.S (diff) | |
parent | uwb: avoid radio controller reset loops (diff) | |
download | linux-3aee0605a41399063c0ad396f1f4267108f210d3.tar.xz linux-3aee0605a41399063c0ad396f1f4267108f210d3.zip |
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/whc-rc.c')
-rw-r--r-- | drivers/uwb/whc-rc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/uwb/whc-rc.c b/drivers/uwb/whc-rc.c index 19a1dd129212..1d9a6f54658e 100644 --- a/drivers/uwb/whc-rc.c +++ b/drivers/uwb/whc-rc.c @@ -443,8 +443,7 @@ static int whcrc_post_reset(struct umc_dev *umc) struct whcrc *whcrc = umc_get_drvdata(umc); struct uwb_rc *uwb_rc = whcrc->uwb_rc; - uwb_rc_post_reset(uwb_rc); - return 0; + return uwb_rc_post_reset(uwb_rc); } /* PCI device ID's that we handle [so it gets loaded] */ |