Merge branch 'upstream' into for-linus

Conflicts:
	drivers/hid/hid-core.c
	drivers/hid/hid-ids.h

13 files changed, 272 insertions, 53 deletions

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 2b006bfa0935..22a4a051f221 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -459,6 +459,13 @@ config HID_PICOLCD_LEDS
         ---help---
           Provide access to PicoLCD's GPO pins via leds class.
 
+config HID_PRIMAX
+        tristate "Primax non-fully HID-compliant devices"
+        depends on USB_HID
+        ---help---
+        Support for Primax devices that are not fully compliant with the
+        HID standard.
+
 config HID_QUANTA
         tristate "Quanta Optical Touch panels"
         depends on USB_HID
@@ -557,7 +564,11 @@ config HID_SMARTJOYPLUS
         tristate "SmartJoy PLUS PS2/USB adapter support"
         depends on USB_HID
         ---help---
-        Support for SmartJoy PLUS PS2/USB adapter.
+        Support for SmartJoy PLUS PS2/USB adapter, Super Dual Box,
+        Super Joy Box 3 Pro, Super Dual Box Pro, and Super Joy Box 5 Pro.
+
+        Note that DDR (Dance Dance Revolution) mode is not supported, nor
+        is pressure sensitive buttons on the pro models.
 
 config SMARTJOYPLUS_FF
         bool "SmartJoy PLUS PS2/USB adapter force feedback support"
diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
index b7ddabb0b34c..1e0d2a638b28 100644
--- a/drivers/hid/Makefile
+++ b/drivers/hid/Makefile
@@ -55,6 +55,7 @@ obj-$(CONFIG_HID_QUANTA)	+= hid-quanta.o
 obj-$(CONFIG_HID_PANTHERLORD)   += hid-pl.o
 obj-$(CONFIG_HID_PETALYNX)      += hid-petalynx.o
 obj-$(CONFIG_HID_PICOLCD)       += hid-picolcd.o
+obj-$(CONFIG_HID_PRIMAX)        += hid-primax.o
 obj-$(CONFIG_HID_ROCCAT)        += hid-roccat.o
 obj-$(CONFIG_HID_ROCCAT_COMMON) += hid-roccat-common.o
 obj-$(CONFIG_HID_ROCCAT_ARVO)   += hid-roccat-arvo.o
diff --git a/drivers/hid/hid-apple.c b/drivers/hid/hid-apple.c
index 18b3bc646bf3..9bc7b03269df 100644
--- a/drivers/hid/hid-apple.c
+++ b/drivers/hid/hid-apple.c
@@ -183,6 +183,9 @@ static int hidinput_apple_event(struct hid_device *hid, struct input_dev *input,
                 if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING4_ANSI &&
                                 hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING4A_JIS)
                         table = macbookair_fn_keys;
+                else if (hid->product >= USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI &&
+                                hid->product <= USB_DEVICE_ID_APPLE_WELLSPRING6_JIS)
+                        table = macbookair_fn_keys;
                 else if (hid->product < 0x21d || hid->product >= 0x300)
                         table = powerbook_fn_keys;
                 else
@@ -493,6 +496,18 @@ static const struct hid_device_id apple_devices[] = {
                 .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING5_JIS),
                 .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI),
+                .driver_data = APPLE_HAS_FN },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO),
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS),
+                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI),
+                .driver_data = APPLE_HAS_FN },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ISO),
+                .driver_data = APPLE_HAS_FN | APPLE_ISO_KEYBOARD },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_JIS),
+                .driver_data = APPLE_HAS_FN | APPLE_RDESC_JIS },
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ANSI),
                 .driver_data = APPLE_NUMLOCK_EMULATION | APPLE_HAS_FN },
         { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_WIRELESS_2009_ISO),
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index c5606724b77a..91adcc5bad28 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -29,6 +29,7 @@
 #include <linux/wait.h>
 #include <linux/vmalloc.h>
 #include <linux/sched.h>
+#include <linux/semaphore.h>
 
 #include <linux/hid.h>
 #include <linux/hiddev.h>
@@ -1085,16 +1086,25 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
         struct hid_report *report;
         char *buf;
         unsigned int i;
-        int ret;
+        int ret = 0;
 
-        if (!hid || !hid->driver)
+        if (!hid)
                 return -ENODEV;
+
+        if (down_trylock(&hid->driver_lock))
+                return -EBUSY;
+
+        if (!hid->driver) {
+                ret = -ENODEV;
+                goto unlock;
+        }
         report_enum = hid->report_enum + type;
         hdrv = hid->driver;
 
         if (!size) {
                 dbg_hid("empty report\n");
-                return -1;
+                ret = -1;
+                goto unlock;
         }
 
         buf = kmalloc(sizeof(char) * HID_DEBUG_BUFSIZE, GFP_ATOMIC);
@@ -1118,18 +1128,24 @@ int hid_input_report(struct hid_device *hid, int type, u8 *data, int size, int i
 nomem:
         report = hid_get_report(report_enum, data);
 
-        if (!report)
-                return -1;
+        if (!report) {
+                ret = -1;
+                goto unlock;
+        }
 
         if (hdrv && hdrv->raw_event && hid_match_report(hid, report)) {
                 ret = hdrv->raw_event(hid, report, data, size);
-                if (ret != 0)
-                        return ret < 0 ? ret : 0;
+                if (ret != 0) {
+                        ret = ret < 0 ? ret : 0;
+                        goto unlock;
+                }
         }
 
         hid_report_raw_event(hid, type, data, size, interrupt);
 
-        return 0;
+unlock:
+        up(&hid->driver_lock);
+        return ret;
 }
 EXPORT_SYMBOL_GPL(hid_input_report);
 
@@ -1349,6 +1365,12 @@ static const struct hid_device_id hid_have_special_driver[] = {
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ANSI) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_ISO) },
         { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_ALU_REVB_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ANSI) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_ISO) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6_JIS) },
+        { HID_USB_DEVICE(USB_VENDOR_ID_APPLE, USB_DEVICE_ID_APPLE_WELLSPRING6A_ANSI) },