diff options
| author | Anssi Hannula <anssi.hannula@gmail.com> | 2008-04-03 22:18:57 +0200 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-04-03 22:18:57 +0200 |
| commit | cfbe20106fa00e89c1fb2c74dbff0ba80e0e539d (patch) | |
| tree | 737c2a591d6f240fe1a38f7f94f0e4d583b92433 /drivers/input/joystick/xpad.c | |
| parent | Input: xpad - do not report nonexistent buttons for xbox360 (diff) | |
| download | linux-cfbe20106fa00e89c1fb2c74dbff0ba80e0e539d.tar.xz linux-cfbe20106fa00e89c1fb2c74dbff0ba80e0e539d.zip | |
Input: xpad - enable force feedback on xbox 360 controllers only
Commit 4994cd8dadcf9d484ab3ec19f3c7c7a4e5353c1c introduced a
regression which causes xpad to report force feedback cababilities
for non-360 controllers too, even while there is no actual support
for those.
Fix that by adding a check for XTYPE_XBOX360 to xpad_init_ff().
Signed-off-by: Anssi Hannula <anssi.hannula@gmail.com>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/joystick/xpad.c')
| -rw-r--r-- | drivers/input/joystick/xpad.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index b48f7051bf30..fd801135eebb 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c @@ -499,6 +499,9 @@ static int xpad_play_effect(struct input_dev *dev, void *data, static int xpad_init_ff(struct usb_xpad *xpad) { + if (xpad->xtype != XTYPE_XBOX360) + return 0; + input_set_capability(xpad->dev, EV_FF, FF_RUMBLE); return input_ff_create_memless(xpad->dev, NULL, xpad_play_effect); |