From 7d264618bc4aa3983e1840c38c0998c7befc8589 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@gmail.com>
Date: Thu, 3 Apr 2008 16:18:57 -0400
Subject: [PATCH] --- yaml --- r: 93232 b: refs/heads/master c:
 cfbe20106fa00e89c1fb2c74dbff0ba80e0e539d h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/input/joystick/xpad.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index edc9ad27ca23..aa46408b92b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc55e95214f1e8384e48cff88279d16507fa5358
+refs/heads/master: cfbe20106fa00e89c1fb2c74dbff0ba80e0e539d
diff --git a/trunk/drivers/input/joystick/xpad.c b/trunk/drivers/input/joystick/xpad.c
index b48f7051bf30..fd801135eebb 100644
--- a/trunk/drivers/input/joystick/xpad.c
+++ b/trunk/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);