Commit 2ea1eab5 authored by James Simmons's avatar James Simmons

Merge http://linux-input.bkbits.net/linux-input

into heisenberg.transvirtual.com:/tmp/linux-input
parents f03622cc fef3dcc0
...@@ -912,6 +912,8 @@ static char * __init initialize_kbd(void) ...@@ -912,6 +912,8 @@ static char * __init initialize_kbd(void)
void __init pckbd_init_hw(void) void __init pckbd_init_hw(void)
{ {
#ifndef CONFIG_SERIO_I8042
kbd_request_region(); kbd_request_region();
/* Flush any pending input. */ /* Flush any pending input. */
...@@ -935,6 +937,7 @@ void __init pckbd_init_hw(void) ...@@ -935,6 +937,7 @@ void __init pckbd_init_hw(void)
/* Ok, finally allocate the IRQ, and off we go.. */ /* Ok, finally allocate the IRQ, and off we go.. */
kbd_request_irq(keyboard_interrupt); kbd_request_irq(keyboard_interrupt);
#endif
} }
#if defined CONFIG_PSMOUSE #if defined CONFIG_PSMOUSE
...@@ -1213,6 +1216,7 @@ static struct miscdevice psaux_mouse = { ...@@ -1213,6 +1216,7 @@ static struct miscdevice psaux_mouse = {
static int __init psaux_init(void) static int __init psaux_init(void)
{ {
#ifndef CONFIG_SERIO_I8042
int retval; int retval;
if (!detect_auxiliary_port()) if (!detect_auxiliary_port())
...@@ -1241,6 +1245,7 @@ static int __init psaux_init(void) ...@@ -1241,6 +1245,7 @@ static int __init psaux_init(void)
#endif /* INITIALIZE_MOUSE */ #endif /* INITIALIZE_MOUSE */
kbd_write_command(KBD_CCMD_MOUSE_DISABLE); /* Disable aux device. */ kbd_write_command(KBD_CCMD_MOUSE_DISABLE); /* Disable aux device. */
kbd_write_cmd(AUX_INTS_OFF); /* Disable controller ints. */ kbd_write_cmd(AUX_INTS_OFF); /* Disable controller ints. */
#endif
return 0; return 0;
} }
......
...@@ -37,6 +37,8 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>"); ...@@ -37,6 +37,8 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
MODULE_DESCRIPTION("Input driver event debug module"); MODULE_DESCRIPTION("Input driver event debug module");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static char evbug_name[] = "evbug";
static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value) static void evbug_event(struct input_handle *handle, unsigned int type, unsigned int code, int value)
{ {
printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n", handle->dev->phys, type, code, value); printk(KERN_DEBUG "evbug.c: Event. Dev: %s, Type: %d, Code: %d, Value: %d\n", handle->dev->phys, type, code, value);
...@@ -52,6 +54,7 @@ static struct input_handle *evbug_connect(struct input_handler *handler, struct ...@@ -52,6 +54,7 @@ static struct input_handle *evbug_connect(struct input_handler *handler, struct
handle->dev = dev; handle->dev = dev;
handle->handler = handler; handle->handler = handler;
handle->name = evbug_name;
input_open_device(handle); input_open_device(handle);
......
...@@ -82,6 +82,7 @@ void serio_handle_events(void) ...@@ -82,6 +82,7 @@ void serio_handle_events(void)
} }
serio->event = 0; serio->event = 0;
serio = serio->next;
} }
} }
...@@ -95,7 +96,7 @@ static int serio_thread(void *nothing) ...@@ -95,7 +96,7 @@ static int serio_thread(void *nothing)
serio_handle_events(); serio_handle_events();
if (current->flags & PF_FREEZE) if (current->flags & PF_FREEZE)
refrigerator(PF_IOTHREAD); refrigerator(PF_IOTHREAD);
wait_event_interruptible(serio_wait, 1); interruptible_sleep_on(&serio_wait);
} while (!signal_pending(current)); } while (!signal_pending(current));
printk(KERN_DEBUG "serio: kseriod exiting"); printk(KERN_DEBUG "serio: kseriod exiting");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment