Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

3 files changed, 8 insertions, 4 deletions

diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
index e03c67dd3e63..f43d6d3cf2fa 100644
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
@@ -606,7 +606,7 @@ static u8 *fetch_item(__u8 *start, __u8 *end, struct hid_item *item)
                 case 2:
                         if ((end - start) < 2)
                                 return NULL;
-                        item->data.u16 = le16_to_cpu(get_unaligned((__le16*)start));
+                        item->data.u16 = get_unaligned_le16(start);
                         start = (__u8 *)((__le16 *)start + 1);
                         return start;
 
@@ -614,7 +614,7 @@ static u8 *fetch_item(__u8 *start, __u8 *end, struct hid_item *item)
                         item->size++;
                         if ((end - start) < 4)
                                 return NULL;
-                        item->data.u32 = le32_to_cpu(get_unaligned((__le32*)start));
+                        item->data.u32 = get_unaligned_le32(start);
                         start = (__u8 *)((__le32 *)start + 1);
                         return start;
         }
@@ -765,7 +765,7 @@ static __inline__ __u32 extract(__u8 *report, unsigned offset, unsigned n)
 
         report += offset >> 3;  /* adjust byte index */
         offset &= 7;            /* now only need bit offset into one byte */
-        x = le64_to_cpu(get_unaligned((__le64 *) report));
+        x = get_unaligned_le64(report);
         x = (x >> offset) & ((1ULL << n) - 1);  /* extract bit field */
         return (u32) x;
 }
diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
index e0d805f1b2bf..01427c51c7cc 100644
--- a/drivers/hid/usbhid/hid-core.c
+++ b/drivers/hid/usbhid/hid-core.c
@@ -654,7 +654,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
         ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
                 HID_REQ_SET_REPORT,
                 USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
-                cpu_to_le16(((HID_OUTPUT_REPORT + 1) << 8) | *buf),
+                ((HID_OUTPUT_REPORT + 1) << 8) | *buf,
                 interface->desc.bInterfaceNumber, buf + 1, count - 1,
                 USB_CTRL_SET_TIMEOUT);
 
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 8d2bc93f8161..b93d91371b14 100644
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -405,6 +405,9 @@
 #define USB_VENDOR_ID_YEALINK           0x6993
 #define USB_DEVICE_ID_YEALINK_P1K_P4K_B2K       0xb001
 
+#define USB_VENDOR_ID_KYE               0x0458
+#define USB_DEVICE_ID_KYE_GPEN_560      0x5003
+
 /*
  * Alphabetically sorted blacklist by quirk type.
  */
@@ -698,6 +701,7 @@ static const struct hid_blacklist {
         { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_63, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_HARMONY_64, HID_QUIRK_IGNORE },
         { USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR, USB_DEVICE_ID_N_S_HARMONY, HID_QUIRK_IGNORE },
+        { USB_VENDOR_ID_KYE, USB_DEVICE_ID_KYE_GPEN_560, HID_QUIRK_IGNORE },
 
         { 0, 0 }
 };