4 files changed, 37 insertions, 8 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 5fa0b952914c..d942d421af51 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -68,9 +68,15 @@ config HID_A4TECH
         ---help---
         Support for A4 tech X5 and WOP-35 / Trust 450L mice.
 
-config HID_ACRUX_FF
-        tristate "ACRUX force feedback"
+config HID_ACRUX
+        tristate "ACRUX game controller support"
         depends on USB_HID
+        ---help---
+        Say Y here if you want to enable support for ACRUX game controllers.
+
+config HID_ACRUX_FF
+        tristate "ACRUX force feedback support"
+        depends on HID_ACRUX
         select INPUT_FF_MEMLESS
         ---help---
         Say Y here if you want to enable force feedback support for ACRUX
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index 569647763d1b..125ba103eba0 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -27,7 +27,7 @@ endif
 
 obj-$(CONFIG_HID_3M_PCT)        += hid-3m-pct.o
 obj-$(CONFIG_HID_A4TECH)        += hid-a4tech.o
-obj-$(CONFIG_HID_ACRUX_FF)      += hid-axff.o
+obj-$(CONFIG_HID_ACRUX)         += hid-axff.o
 obj-$(CONFIG_HID_APPLE)         += hid-apple.o
 obj-$(CONFIG_HID_BELKIN)        += hid-belkin.o
 obj-$(CONFIG_HID_CANDO)         += hid-cando.o
diff --git a/drivers/hid/hid-axff.c b/drivers/hid/hid-axff.c
index e5b961d6ff22..b4554288de00 100644
--- a/drivers/hid/hid-axff.c
+++ b/drivers/hid/hid-axff.c
@@ -33,6 +33,8 @@
 #include <linux/hid.h>
 
 #include "hid-ids.h"
+
+#ifdef CONFIG_HID_ACRUX_FF
 #include "usbhid/usbhid.h"
 
 struct axff_device {
@@ -109,6 +111,12 @@ err_free_mem:
         kfree(axff);
         return error;
 }
+#else
+static inline int axff_init(struct hid_device *hid)
+{
+        return 0;
+}
+#endif
 
 static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)
 {
@@ -139,9 +147,25 @@ static int ax_probe(struct hid_device *hdev, const struct hid_device_id *id)
                          error);
         }
 
+        /*
+         * We need to start polling device right away, otherwise
+         * it will go into a coma.
+         */
+        error = hid_hw_open(hdev);
+        if (error) {
+                dev_err(&hdev->dev, "hw open failed\n");
+                return error;
+        }
+
         return 0;
 }
 
+static void ax_remove(struct hid_device *hdev)
+{
+        hid_hw_close(hdev);
+        hid_hw_stop(hdev);
+}
+
 static const struct hid_device_id ax_devices[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802), },
         { }
@@ -149,9 +173,10 @@ static const struct hid_device_id ax_devices[] = {
 MODULE_DEVICE_TABLE(hid, ax_devices);
 
 static struct hid_driver ax_driver = {
-        .name = "acrux",
-        .id_table = ax_devices,
-        .probe = ax_probe,
+        .name           = "acrux",
+        .id_table       = ax_devices,
+        .probe          = ax_probe,
+        .remove         = ax_remove,
 };
 
 static int __init ax_init(void)
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 570db37d574d..c650efb52a45 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -1289,9 +1289,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_WCP32PU) },
         { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_X5_005D) },
         { HID_USB_DEVICE(USB_VENDOR_ID_A4TECH, USB_DEVICE_ID_A4TECH_RP_649) },
-#if defined(CONFIG_HID_ACRUX_FF) || defined(CONFIG_HID_ACRUX_FF_MODULE)
         { HID_USB_DEVICE(USB_VENDOR_ID_ACRUX, 0x0802) },
-#endif
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ATV_IRCONTROL) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_IRCONTROL4) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_MIGHTYMOUSE) },