diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 12:44:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-17 12:44:09 -0400 |
| commit | 3aee0605a41399063c0ad396f1f4267108f210d3 (patch) | |
| tree | c9e3ce738c3d093dbd861c5a53b63157edd893c2 /include/linux | |
| 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 'include/linux')
| -rw-r--r-- | include/linux/uwb.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/uwb.h b/include/linux/uwb.h index c02128991ff7..7fc9746f22cd 100644 --- a/include/linux/uwb.h +++ b/include/linux/uwb.h | |||
| @@ -597,7 +597,7 @@ void uwb_rc_neh_grok(struct uwb_rc *, void *, size_t); | |||
| 597 | void uwb_rc_neh_error(struct uwb_rc *, int); | 597 | void uwb_rc_neh_error(struct uwb_rc *, int); |
| 598 | void uwb_rc_reset_all(struct uwb_rc *rc); | 598 | void uwb_rc_reset_all(struct uwb_rc *rc); |
| 599 | void uwb_rc_pre_reset(struct uwb_rc *rc); | 599 | void uwb_rc_pre_reset(struct uwb_rc *rc); |
| 600 | void uwb_rc_post_reset(struct uwb_rc *rc); | 600 | int uwb_rc_post_reset(struct uwb_rc *rc); |
| 601 | 601 | ||
| 602 | /** | 602 | /** |
| 603 | * uwb_rsv_is_owner - is the owner of this reservation the RC? | 603 | * uwb_rsv_is_owner - is the owner of this reservation the RC? |