Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / usb / input / hid-ff.c

diff --git a/drivers/usb/input/hid-ff.c b/drivers/usb/input/hid-ff.c
index b43463b..d5c91ee 100644 (file)
--- a/drivers/usb/input/hid-ff.c
+++ b/drivers/usb/input/hid-ff.c
@@ -34,12 +34,6 @@
 
 #include "hid.h"
 
-/* Drivers' initializing functions */
-extern int hid_lgff_init(struct hid_device* hid);
-extern int hid_lg3d_init(struct hid_device* hid);
-extern int hid_pid_init(struct hid_device* hid);
-extern int hid_tmff_init(struct hid_device* hid);
-
 /*
  * This table contains pointers to initializers. To add support for new
  * devices, you need to add the USB vendor and product ids here.
@@ -55,6 +49,7 @@ static struct hid_ff_initializer inits[] = {
        {0x46d, 0xc211, hid_lgff_init}, // Logitech Cordless rumble pad
        {0x46d, 0xc283, hid_lgff_init}, // Logitech Wingman Force 3d
        {0x46d, 0xc295, hid_lgff_init}, // Logitech MOMO force wheel
+       {0x46d, 0xc219, hid_lgff_init}, // Logitech Cordless rumble pad 2
 #endif
 #ifdef CONFIG_HID_PID
        {0x45e, 0x001b, hid_pid_init},
@@ -82,8 +77,8 @@ int hid_ff_init(struct hid_device* hid)
 {
        struct hid_ff_initializer *init;
 
-       init = hid_get_ff_init(hid->dev->descriptor.idVendor,
-                              hid->dev->descriptor.idProduct);
+       init = hid_get_ff_init(le16_to_cpu(hid->dev->descriptor.idVendor),
+                              le16_to_cpu(hid->dev->descriptor.idProduct));
 
        if (!init) {
                dbg("hid_ff_init could not find initializer");