diff options
| author |   Hans Petter Selasky <hselasky@c2i.net> | 2011-05-25 09:24:32 -0700 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-05-25 09:24:58 -0700 |
| commit | 8c127f0717b438e6abc3d92d4ae248c4224b9dcb (patch) | |
| tree | eed2a50bf743fabe68f1f59f1537de8e3f2548d1 /drivers/input/input.c | |
| parent | Merge branch 'next' into for-linus (diff) | |
| download | linux-dev-8c127f0717b438e6abc3d92d4ae248c4224b9dcb.tar.xz linux-dev-8c127f0717b438e6abc3d92d4ae248c4224b9dcb.zip | |
Input: properly assign return value of clamp() macro.
[dtor@mail.ru: added mousedev changes]
Signed-off-by: Hans Petter Selasky <hselasky@c2i.net>
Cc: stable@kernel.org
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/input.c')
| -rw-r--r-- | drivers/input/input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/input.c b/drivers/input/input.c index 75e11c7b70fd..da38d97a51b1 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -1756,7 +1756,7 @@ static unsigned int input_estimate_events_per_packet(struct input_dev *dev) } else if (test_bit(ABS_MT_TRACKING_ID, dev->absbit)) { mt_slots = dev->absinfo[ABS_MT_TRACKING_ID].maximum - dev->absinfo[ABS_MT_TRACKING_ID].minimum + 1, - clamp(mt_slots, 2, 32); + mt_slots = clamp(mt_slots, 2, 32); } else if (test_bit(ABS_MT_POSITION_X, dev->absbit)) { mt_slots = 2; } else { |