aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/uwb/neh.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/uwb/neh.c
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/uwb/neh.c')
-rw-r--r--drivers/uwb/neh.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/uwb/neh.c b/drivers/uwb/neh.c
index 0af8916d9bef..78510a1f410d 100644
--- a/drivers/uwb/neh.c
+++ b/drivers/uwb/neh.c
@@ -150,7 +150,7 @@ void uwb_rc_neh_put(struct uwb_rc_neh *neh)
150 * 0xff is invalid, so they must not be used. Initialization 150 * 0xff is invalid, so they must not be used. Initialization
151 * fills up those two in the bitmap so they are not allocated. 151 * fills up those two in the bitmap so they are not allocated.
152 * 152 *
153 * We spread the allocation around to reduce the posiblity of two 153 * We spread the allocation around to reduce the possibility of two
154 * consecutive opened @neh's getting the same context ID assigned (to 154 * consecutive opened @neh's getting the same context ID assigned (to
155 * avoid surprises with late events that timed out long time ago). So 155 * avoid surprises with late events that timed out long time ago). So
156 * first we search from where @rc->ctx_roll is, if not found, we 156 * first we search from where @rc->ctx_roll is, if not found, we