2 files changed, 7 insertions, 14 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index 73bd9e2e42bc..aef7c56ca5e7 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -780,22 +780,19 @@ static int hid_scan_report(struct hid_device *hid)
                 hid->group = HID_GROUP_MULTITOUCH_WIN_8;
 
         /*
-        * Vendor specific handlings
-        */
-        if ((hid->vendor == USB_VENDOR_ID_SYNAPTICS) &&
-            (hid->group == HID_GROUP_GENERIC) &&
-            /* only bind to the mouse interface of composite USB devices */
-            (hid->bus != BUS_USB || hid->type == HID_TYPE_USBMOUSE))
-                /* hid-rmi should take care of them, not hid-generic */
-                hid->group = HID_GROUP_RMI;
-
-        /*
          * Vendor specific handlings
          */
         switch (hid->vendor) {
         case USB_VENDOR_ID_WACOM:
                 hid->group = HID_GROUP_WACOM;
                 break;
+        case USB_VENDOR_ID_SYNAPTICS:
+                if ((hid->group == HID_GROUP_GENERIC) &&
+                    (hid->bus != BUS_USB || hid->type == HID_TYPE_USBMOUSE))
+                        /* hid-rmi should only bind to the mouse interface of
+                         * composite USB devices */
+                        hid->group = HID_GROUP_RMI;
+                break;
         }
 
         vfree(parser);
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 78ea9bf941cd..5b1ff6110e25 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -312,10 +312,6 @@ struct hid_item {
  * Vendor specific HID device groups
  */
 #define HID_GROUP_RMI                           0x0100
-
-/*
- * Vendor specific HID device groups
- */
 #define HID_GROUP_WACOM                         0x0101
 
 /*