From: Anssi Hannula Date: Thu, 3 Apr 2008 20:18:57 +0000 (-0400) Subject: Input: xpad - enable force feedback on xbox 360 controllers only X-Git-Tag: v2.6.26-rc1~1062^2^2~19^2~3 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cfbe20106fa00e89c1fb2c74dbff0ba80e0e539d;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: Dmitry Torokhov --- diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index b48f7051bf3..fd801135eeb 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);