diff options
| author | Christoph Fritz <chf.fritz@googlemail.com> | 2010-08-24 03:33:37 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2010-08-25 10:50:44 -0400 |
| commit | 268ba5c05b82af575819bd719a2facb2a3169260 (patch) | |
| tree | 8ce615e190e39bbc24e689e221a39390cc8d9fa7 /drivers/input | |
| parent | 8905aaafb4b5d9764c5b4b54c7d03eb41bb0a7e9 (diff) | |
Input: mousedev - fix regression of inverting axes
Introduced by 987a6c0298260b7aa40702b349282554d6180e4b a swap in max/min
calculation gets fixed by this patch.
Reported-by: Bruno Prémont <bonbons@linux-vserver.org>
Signed-off-by: Christoph Fritz <chf.fritz@googlemail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input')
| -rw-r--r-- | drivers/input/mousedev.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/mousedev.c b/drivers/input/mousedev.c index 83c24cca234..d528a2dba06 100644 --- a/drivers/input/mousedev.c +++ b/drivers/input/mousedev.c | |||
| @@ -138,8 +138,8 @@ static void mousedev_touchpad_event(struct input_dev *dev, | |||
| 138 | 138 | ||
| 139 | fx(0) = value; | 139 | fx(0) = value; |
| 140 | if (mousedev->touch && mousedev->pkt_count >= 2) { | 140 | if (mousedev->touch && mousedev->pkt_count >= 2) { |
| 141 | size = input_abs_get_min(dev, ABS_X) - | 141 | size = input_abs_get_max(dev, ABS_X) - |
| 142 | input_abs_get_max(dev, ABS_X); | 142 | input_abs_get_min(dev, ABS_X); |
| 143 | if (size == 0) | 143 | if (size == 0) |
| 144 | size = 256 * 2; | 144 | size = 256 * 2; |
| 145 | 145 | ||
| @@ -155,8 +155,8 @@ static void mousedev_touchpad_event(struct input_dev *dev, | |||
| 155 | fy(0) = value; | 155 | fy(0) = value; |
| 156 | if (mousedev->touch && mousedev->pkt_count >= 2) { | 156 | if (mousedev->touch && mousedev->pkt_count >= 2) { |
| 157 | /* use X size for ABS_Y to keep the same scale */ | 157 | /* use X size for ABS_Y to keep the same scale */ |
| 158 | size = input_abs_get_min(dev, ABS_X) - | 158 | size = input_abs_get_max(dev, ABS_X) - |
| 159 | input_abs_get_max(dev, ABS_X); | 159 | input_abs_get_min(dev, ABS_X); |
| 160 | if (size == 0) | 160 | if (size == 0) |
| 161 | size = 256 * 2; | 161 | size = 256 * 2; |
| 162 | 162 | ||