Merge kernel.bkbits.net:/home/torvalds/linux-2.6

into kernel.bkbits.net:/home/vojtech/for-linus

drivers/input/serio/i8042.c

@@ -482,7 +482,7 @@ static int i8042_set_mux_mode(unsigned int mode, unsigned char *mux_version)
 	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x0f)
 		return -1;
 	param = mode ? 0x56 : 0xf6;
-	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa9)
+	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != (mode ? 0xa9 : 0x09))
 		return -1;
 	param = mode ? 0xa4 : 0xa5;
 	if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == (mode ? 0x5b : 0x5a))
@@ -787,6 +787,7 @@ void i8042_controller_reset(void)
  * Disable MUX mode if present.
  */
 
+	if (i8042_mux_present)
 		i8042_set_mux_mode(0, NULL);
 
 /*

drivers/usb/input/hid-input.c

@@ -492,6 +492,9 @@ static int hidinput_input_event(struct input_dev *dev, unsigned int type, unsign
 	if (type == EV_FF)
 		return hid_ff_event(hid, dev, type, code, value);
 
+	if (type != EV_LED)
+		return -1;
+
 	if ((offset = hid_find_field(hid, type, code, &field)) == -1) {
 		warn("event field not found");
 		return -1;