diff options
| author | Hans Petter Selasky <hselasky@c2i.net> | 2011-05-25 09:24:32 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-08 23:15:22 -0700 |
| commit | d02ec2a0a712e8636f65985457169458a822d17e (patch) | |
| tree | b1eee81229d2ca6a9d3d8eeaf7098cef90658bb5 /drivers/input/input.c | |
| parent | 46c441db452d0eb8e52b426f37304f131e30c808 (diff) | |
Input: properly assign return value of clamp() macro.
commit 8c127f0717b438e6abc3d92d4ae248c4224b9dcb upstream.
[dtor@mail.ru: added mousedev changes]
Signed-off-by: Hans Petter Selasky <hselasky@c2i.net>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 ebbceedc92f..e3c88fc3c75 100644 --- a/drivers/input/input.c +++ b/drivers/input/input.c @@ -1757,7 +1757,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 { |