aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/input/hid-ff.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/usb/input/hid-ff.c')
-rw-r--r--drivers/usb/input/hid-ff.c12
1 files changed, 9 insertions, 3 deletions
diff --git a/drivers/usb/input/hid-ff.c b/drivers/usb/input/hid-ff.c
index 0d644fa37c68..bc7f8e6f8c97 100644
--- a/drivers/usb/input/hid-ff.c
+++ b/drivers/usb/input/hid-ff.c
@@ -32,7 +32,8 @@
32#undef DEBUG 32#undef DEBUG
33#include <linux/usb.h> 33#include <linux/usb.h>
34 34
35#include "hid.h" 35#include <linux/hid.h>
36#include "usbhid.h"
36 37
37/* 38/*
38 * This table contains pointers to initializers. To add support for new 39 * This table contains pointers to initializers. To add support for new
@@ -58,6 +59,9 @@ static struct hid_ff_initializer inits[] = {
58 { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */ 59 { 0x46d, 0xc219, hid_lgff_init }, /* Logitech Cordless rumble pad 2 */
59 { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */ 60 { 0x46d, 0xca03, hid_lgff_init }, /* Logitech MOMO force wheel */
60#endif 61#endif
62#ifdef CONFIG_PANTHERLORD_FF
63 { 0x810, 0x0001, hid_plff_init },
64#endif
61#ifdef CONFIG_THRUSTMASTER_FF 65#ifdef CONFIG_THRUSTMASTER_FF
62 { 0x44f, 0xb304, hid_tmff_init }, 66 { 0x44f, 0xb304, hid_tmff_init },
63#endif 67#endif
@@ -71,8 +75,8 @@ static struct hid_ff_initializer inits[] = {
71int hid_ff_init(struct hid_device* hid) 75int hid_ff_init(struct hid_device* hid)
72{ 76{
73 struct hid_ff_initializer *init; 77 struct hid_ff_initializer *init;
74 int vendor = le16_to_cpu(hid->dev->descriptor.idVendor); 78 int vendor = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idVendor);
75 int product = le16_to_cpu(hid->dev->descriptor.idProduct); 79 int product = le16_to_cpu(hid_to_usb_dev(hid)->descriptor.idProduct);
76 80
77 for (init = inits; init->idVendor; init++) 81 for (init = inits; init->idVendor; init++)
78 if (init->idVendor == vendor && init->idProduct == product) 82 if (init->idVendor == vendor && init->idProduct == product)
@@ -80,3 +84,5 @@ int hid_ff_init(struct hid_device* hid)
80 84
81 return init->init(hid); 85 return init->init(hid);
82} 86}
87EXPORT_SYMBOL_GPL(hid_ff_init);
88