[PATCH] HID: Fix dropped device-specific quirks

[Zoltan Karcagi <zkr@freemail.hu>]

Hi,

(Originally sent to linux-usb, description slightly rephrased.)

Please consider for merging. Without this patch, the device below does not work at all on kernel 2.6.28
and upwards.

Device-specific quirks are set up correctly in their respective vendor-specific driver, then
get overwritten in usbhid_parse().
Found on a Microsoft Wireless Optical Desktop 3.0 [045e:009d].

Signed-off-by: Zoltan Karcagi <zkr@freemail.hu>

diff -r -U 5 linux-2.6.30-rc4/drivers/hid/usbhid/hid-core.c linux-2.6.30-rc4-fixed/drivers/hid/usbhid/hid-core.c
--- linux-2.6.30-rc4/drivers/hid/usbhid/hid-core.c    2009-05-01 12:06:18.000000000 +0200
+++ linux-2.6.30-rc4-fixed/drivers/hid/usbhid/hid-core.c    2009-05-03 14:43:47.000000000 +0200
@@ -896,11 +896,11 @@
 if (ret) {
     dbg_hid("parsing report descriptor failed\n");
     goto err;
 }

-    hid->quirks = quirks;
+    hid->quirks |= quirks;

 return 0;
err:
 return ret;
}