diff options
author | Daniel Mack <daniel@caiaq.de> | 2010-05-21 01:52:58 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-05-21 02:05:28 -0400 |
commit | 81c2a3ba497835797332b517ebf2de7b7f2a7c80 (patch) | |
tree | a7dee14c14bdf2a1d9a5aa99bf9625943ace70ba /drivers/input/joydev.c | |
parent | a62f0d27b4196bad5e900d766b285feb7069cd16 (diff) |
Input: use ABS_CNT rather than (ABS_MAX + 1)
Signed-off-by: Daniel Mack <daniel@caiaq.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/joydev.c')
-rw-r--r-- | drivers/input/joydev.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c index 423e0e6031ab..34157bb97ed6 100644 --- a/drivers/input/joydev.c +++ b/drivers/input/joydev.c | |||
@@ -47,15 +47,15 @@ struct joydev { | |||
47 | struct mutex mutex; | 47 | struct mutex mutex; |
48 | struct device dev; | 48 | struct device dev; |
49 | 49 | ||
50 | struct js_corr corr[ABS_MAX + 1]; | 50 | struct js_corr corr[ABS_CNT]; |
51 | struct JS_DATA_SAVE_TYPE glue; | 51 | struct JS_DATA_SAVE_TYPE glue; |
52 | int nabs; | 52 | int nabs; |
53 | int nkey; | 53 | int nkey; |
54 | __u16 keymap[KEY_MAX - BTN_MISC + 1]; | 54 | __u16 keymap[KEY_MAX - BTN_MISC + 1]; |
55 | __u16 keypam[KEY_MAX - BTN_MISC + 1]; | 55 | __u16 keypam[KEY_MAX - BTN_MISC + 1]; |
56 | __u8 absmap[ABS_MAX + 1]; | 56 | __u8 absmap[ABS_CNT]; |
57 | __u8 abspam[ABS_MAX + 1]; | 57 | __u8 abspam[ABS_CNT]; |
58 | __s16 abs[ABS_MAX + 1]; | 58 | __s16 abs[ABS_CNT]; |
59 | }; | 59 | }; |
60 | 60 | ||
61 | struct joydev_client { | 61 | struct joydev_client { |
@@ -826,7 +826,7 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev, | |||
826 | joydev->handle.handler = handler; | 826 | joydev->handle.handler = handler; |
827 | joydev->handle.private = joydev; | 827 | joydev->handle.private = joydev; |
828 | 828 | ||
829 | for (i = 0; i < ABS_MAX + 1; i++) | 829 | for (i = 0; i < ABS_CNT; i++) |
830 | if (test_bit(i, dev->absbit)) { | 830 | if (test_bit(i, dev->absbit)) { |
831 | joydev->absmap[i] = joydev->nabs; | 831 | joydev->absmap[i] = joydev->nabs; |
832 | joydev->abspam[joydev->nabs] = i; | 832 | joydev->abspam[joydev->nabs] = i; |