--- linux-2.6.11.8/drivers/usb/input/hid-core.c	2005-04-29 21:28:38.000000000 -0400
+++ linux-2.6.11.8.adk/drivers/usb/input/hid-core.c	2005-06-12 19:24:36.000000000 -0400
@@ -781,13 +781,20 @@
 	return -1;
 }
 
-static void hid_process_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, struct pt_regs *regs)
+static void hid_process_event(struct hid_device *hid, struct hid_field *field, struct hid_usage *usage, __s32 value, struct urb *urb, struct pt_regs *regs)
 {
 	hid_dump_input(usage, value);
 	if (hid->claimed & HID_CLAIMED_INPUT)
 		hidinput_hid_event(hid, field, usage, value, regs);
-	if (hid->claimed & HID_CLAIMED_HIDDEV)
-		hiddev_hid_event(hid, field, usage, value, regs);
+	if (hid->claimed & HID_CLAIMED_HIDDEV) {
+		if (urb == hid->urbin) {
+			dbg("Reporting interrupt event to hiddev (rpt 0x%02x)", *(u8*)urb->transfer_buffer);
+			hiddev_hid_event(hid, field, usage, value, regs);
+		} else {
+			dbg("Not interrupt xfer; skipping hiddev reporting (rpt 0x%02x)",
+				*(u8*)urb->transfer_buffer);
+		}
+	}
 }
 
 /*
@@ -796,7 +803,7 @@
  * reporting to the layer).
  */
 
-static void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, struct pt_regs *regs)
+static void hid_input_field(struct hid_device *hid, struct hid_field *field, __u8 *data, struct urb *urb, struct pt_regs *regs)
 {
 	unsigned n;
 	unsigned count = field->report_count;
@@ -832,19 +839,19 @@
 				if (value[n] == field->value[n])
 					continue;
 			}	
-			hid_process_event(hid, field, &field->usage[n], value[n], regs);
+			hid_process_event(hid, field, &field->usage[n], value[n], urb, regs);
 			continue;
 		}
 
 		if (field->value[n] >= min && field->value[n] <= max
 			&& field->usage[field->value[n] - min].hid
 			&& search(value, field->value[n], count))
-				hid_process_event(hid, field, &field->usage[field->value[n] - min], 0, regs);
+				hid_process_event(hid, field, &field->usage[field->value[n] - min], 0, urb, regs);
 
 		if (value[n] >= min && value[n] <= max
 			&& field->usage[value[n] - min].hid
 			&& search(field->value, value[n], count))
-				hid_process_event(hid, field, &field->usage[value[n] - min], 1, regs);
+				hid_process_event(hid, field, &field->usage[value[n] - min], 1, urb, regs);
 	}
 
 	memcpy(field->value, value, count * sizeof(__s32));
@@ -902,7 +909,7 @@
 		hiddev_report_event(hid, report);
 
 	for (n = 0; n < report->maxfield; n++)
-		hid_input_field(hid, report->field[n], data, regs);
+		hid_input_field(hid, report->field[n], data, urb, regs);
 
 	if (hid->claimed & HID_CLAIMED_INPUT)
 		hidinput_report_event(hid, report);
@@ -921,6 +928,7 @@
 
 	switch (urb->status) {
 		case 0:			/* success */
+			dbg("Interrupt report 0x%02x", *(u8*)urb->transfer_buffer);
 			hid_input_report(HID_INPUT_REPORT, urb, regs);
 			break;
 		case -ECONNRESET:	/* unlink */