Input: iforce -- add support for ACT LABS forceRS
diff mbox

Message ID alpine.LNX.2.00.0908172246340.25797@wotan.suse.de
State Accepted
Commit 68947b8f9a36f7f7f54ca95e0c6e169bb603e803
Headers show

Commit Message

Jiri Kosina Aug. 17, 2009, 8:48 p.m. UTC
On Mon, 17 Aug 2009, cmd_ wrote:

> Patch does not work as-is for me.
[ ... ]
> This was a mistype from my 1st e-mail, sorry.

Thanks, corrected one below.



From: Jiri Kosina <jkosina@suse.cz>
Subject: [PATCH] Input: iforce -- add support for ACT LABS forceRS

Add support for ACT LABS forceRS.

Reported-by: cmd_ <cemede@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

Comments

Dmitry Torokhov Aug. 18, 2009, 5:26 a.m. UTC | #1
On Mon, Aug 17, 2009 at 10:48:36PM +0200, Jiri Kosina wrote:
> On Mon, 17 Aug 2009, cmd_ wrote:
> 
> > Patch does not work as-is for me.
> [ ... ]
> > This was a mistype from my 1st e-mail, sorry.
> 
> Thanks, corrected one below.
> 

Applied, thank you Jiri.

Patch
diff mbox

diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c
index baabf83..f6c688c 100644
--- a/drivers/input/joystick/iforce/iforce-main.c
+++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -74,6 +74,7 @@  static struct iforce_device iforce_device[] = {
 	{ 0x05ef, 0x8884, "AVB Mag Turbo Force",			btn_avb_wheel, abs_wheel, ff_iforce },
 	{ 0x05ef, 0x8888, "AVB Top Shot Force Feedback Racing Wheel",	btn_avb_tw, abs_wheel, ff_iforce }, //?
 	{ 0x061c, 0xc0a4, "ACT LABS Force RS",                          btn_wheel, abs_wheel, ff_iforce }, //?
+	{ 0x061c, 0xc084, "ACT LABS Force RS",				btn_wheel, abs_wheel, ff_iforce },
 	{ 0x06f8, 0x0001, "Guillemot Race Leader Force Feedback",	btn_wheel, abs_wheel, ff_iforce }, //?
 	{ 0x06f8, 0x0004, "Guillemot Force Feedback Racing Wheel",	btn_wheel, abs_wheel, ff_iforce }, //?
 	{ 0x06f8, 0x0004, "Gullemot Jet Leader 3D",			btn_joystick, abs_joystick, ff_iforce }, //?
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c
index f83185a..9f289d8 100644
--- a/drivers/input/joystick/iforce/iforce-usb.c
+++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -223,6 +223,7 @@  static struct usb_device_id iforce_usb_ids [] = {
 	{ USB_DEVICE(0x05ef, 0x8884) },		/* AVB Mag Turbo Force */
 	{ USB_DEVICE(0x05ef, 0x8888) },		/* AVB Top Shot FFB Racing Wheel */
 	{ USB_DEVICE(0x061c, 0xc0a4) },         /* ACT LABS Force RS */
+	{ USB_DEVICE(0x061c, 0xc084) },         /* ACT LABS Force RS */
 	{ USB_DEVICE(0x06f8, 0x0001) },		/* Guillemot Race Leader Force Feedback */
 	{ USB_DEVICE(0x06f8, 0x0004) },		/* Guillemot Force Feedback Racing Wheel */
 	{ USB_DEVICE(0x06f8, 0xa302) },		/* Guillemot Jet Leader 3D */