diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 13:56:35 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-03-09 13:56:35 -0500 |
| commit | 05b7b842fa1798c4775997602d42f3d6373e7ef3 (patch) | |
| tree | a0942796d362b68c893ec1d92c106a6f04010545 /include/linux/input | |
| parent | b675b3667f6729dcd1036a2a129b35445947f905 (diff) | |
| parent | 7491f3dffd99fadf1239011c0ab5346925618dae (diff) | |
Merge branch 'for-next' of github.com:rydberg/linux into next
Diffstat (limited to 'include/linux/input')
| -rw-r--r-- | include/linux/input/mt.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/linux/input/mt.h b/include/linux/input/mt.h index 318bb82325a6..f86737586e19 100644 --- a/include/linux/input/mt.h +++ b/include/linux/input/mt.h | |||
| @@ -48,10 +48,14 @@ static inline void input_mt_slot(struct input_dev *dev, int slot) | |||
| 48 | input_event(dev, EV_ABS, ABS_MT_SLOT, slot); | 48 | input_event(dev, EV_ABS, ABS_MT_SLOT, slot); |
| 49 | } | 49 | } |
| 50 | 50 | ||
| 51 | static inline bool input_is_mt_value(int axis) | ||
| 52 | { | ||
| 53 | return axis >= ABS_MT_FIRST && axis <= ABS_MT_LAST; | ||
| 54 | } | ||
| 55 | |||
| 51 | static inline bool input_is_mt_axis(int axis) | 56 | static inline bool input_is_mt_axis(int axis) |
| 52 | { | 57 | { |
| 53 | return axis == ABS_MT_SLOT || | 58 | return axis == ABS_MT_SLOT || input_is_mt_value(axis); |
| 54 | (axis >= ABS_MT_FIRST && axis <= ABS_MT_LAST); | ||
| 55 | } | 59 | } |
| 56 | 60 | ||
| 57 | void input_mt_report_slot_state(struct input_dev *dev, | 61 | void input_mt_report_slot_state(struct input_dev *dev, |