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

diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
index 1df832a8fcbc6251f180d25ce809f11c803bcec9..b98ec426b4d42750f67e3f29e78f7a0080eb43be 100644 (file)
--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -1128,7 +1128,7 @@ static void usbhid_fixup_microsoft_descriptor(unsigned char *rdesc, int rsize)
                         && rdesc[557] == 0x19
                         && rdesc[559] == 0x29) {
                printk(KERN_INFO "Fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n");
-               rdesc[284] = rdesc[304] = rdesc[558] = 0x35;
+               rdesc[284] = rdesc[304] = rdesc[557] = 0x35;
                rdesc[352] = 0x36;
                rdesc[286] = rdesc[355] = 0x46;
                rdesc[306] = rdesc[559] = 0x45;