Input: xpad - fix inverted Y and RY axes

The commit ae91d10aab2762f81733e9194cb56eff99c8d808 inverted Y and RY
axes on xbox360 so that up is positive and down is negative.
This is wrong, as axes on game controllers have up as negative per
convention. Also, even xpad itself reports HAT0X with up as negative.

Fix that by inverting them again.

Also, according to http://bugzilla.kernel.org/show_bug.cgi?id=10337 the
original xbox controllers also have the Y and RY axes inverted.
Fix that by inverting them as well.

Cc: Brian Magnuson <bdmagnuson@gmail.com>
Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>

diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 6288c4f6e3a3f6f31c30def190d0dbfc7f9ac2bd..316d98755440b97e0edfb41bbe358b492340668b 100644 (file)
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -236,13 +236,13 @@ static void xpad_process_packet(struct usb_xpad *xpad, u16 cmd, unsigned char *d
        input_report_abs(dev, ABS_X,
                         (__s16) le16_to_cpup((__le16 *)(data + 12)));
        input_report_abs(dev, ABS_Y,
-                        (__s16) le16_to_cpup((__le16 *)(data + 14)));
+                        ~(__s16) le16_to_cpup((__le16 *)(data + 14)));
 
        /* right stick */
        input_report_abs(dev, ABS_RX,
                         (__s16) le16_to_cpup((__le16 *)(data + 16)));
        input_report_abs(dev, ABS_RY,
-                        (__s16) le16_to_cpup((__le16 *)(data + 18)));
+                        ~(__s16) le16_to_cpup((__le16 *)(data + 18)));
 
        /* triggers left/right */
        input_report_abs(dev, ABS_Z, data[10]);
@@ -330,13 +330,13 @@ static void xpad360_process_packet(struct usb_xpad *xpad,
        input_report_abs(dev, ABS_X,
                         (__s16) le16_to_cpup((__le16 *)(data + 6)));
        input_report_abs(dev, ABS_Y,
-                        (__s16) le16_to_cpup((__le16 *)(data + 8)));
+                        ~(__s16) le16_to_cpup((__le16 *)(data + 8)));
 
        /* right stick */
        input_report_abs(dev, ABS_RX,
                         (__s16) le16_to_cpup((__le16 *)(data + 10)));
        input_report_abs(dev, ABS_RY,
-                        (__s16) le16_to_cpup((__le16 *)(data + 12)));
+                        ~(__s16) le16_to_cpup((__le16 *)(data + 12)));
 
        /* triggers left/right */
        input_report_abs(dev, ABS_Z, data[4]);