Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/dtor/input.git manually

Some manual fixups required due to clashes with the PF_FREEZE cleanups.

1 files changed, 8 insertions, 13 deletions

diff --git a/drivers/input/mouse/pc110pad.c b/drivers/input/mouse/pc110pad.c
index 0c74918fe254..93393d5c0078 100644
--- a/drivers/input/mouse/pc110pad.c
+++ b/drivers/input/mouse/pc110pad.c
@@ -4,7 +4,7 @@
  *  Copyright (c) 2000-2001 Vojtech Pavlik
  *
  *  Based on the work of:
- *      Alan Cox        Robin O'Leary   
+ *      Alan Cox        Robin O'Leary
  */
 
 /*
@@ -56,7 +56,6 @@ static int pc110pad_io = 0x15e0;
 static struct input_dev pc110pad_dev;
 static int pc110pad_data[3];
 static int pc110pad_count;
-static int pc110pad_used;
 
 static char *pc110pad_name = "IBM PC110 TouchPad";
 static char *pc110pad_phys = "isa15e0/input0";
@@ -74,7 +73,7 @@ static irqreturn_t pc110pad_interrupt(int irq, void *ptr, struct pt_regs *regs)
 
         if (pc110pad_count < 3)
                 return IRQ_HANDLED;
-        
+
         input_regs(&pc110pad_dev, regs);
         input_report_key(&pc110pad_dev, BTN_TOUCH,
                 pc110pad_data[0] & 0x01);
@@ -90,15 +89,11 @@ static irqreturn_t pc110pad_interrupt(int irq, void *ptr, struct pt_regs *regs)
 
 static void pc110pad_close(struct input_dev *dev)
 {
-        if (!--pc110pad_used)
-                outb(PC110PAD_OFF, pc110pad_io + 2);
+        outb(PC110PAD_OFF, pc110pad_io + 2);
 }
 
 static int pc110pad_open(struct input_dev *dev)
 {
-        if (pc110pad_used++)
-                return 0;
-
         pc110pad_interrupt(0,NULL,NULL);
         pc110pad_interrupt(0,NULL,NULL);
         pc110pad_interrupt(0,NULL,NULL);
@@ -145,7 +140,7 @@ static int __init pc110pad_init(void)
 
         pc110pad_dev.absmax[ABS_X] = 0x1ff;
         pc110pad_dev.absmax[ABS_Y] = 0x0ff;
-        
+
         pc110pad_dev.open = pc110pad_open;
         pc110pad_dev.close = pc110pad_close;
 
@@ -156,17 +151,17 @@ static int __init pc110pad_init(void)
         pc110pad_dev.id.product = 0x0001;
         pc110pad_dev.id.version = 0x0100;
 
-        input_register_device(&pc110pad_dev);   
+        input_register_device(&pc110pad_dev);
 
         printk(KERN_INFO "input: %s at %#x irq %d\n",
                 pc110pad_name, pc110pad_io, pc110pad_irq);
-        
+
         return 0;
 }
- 
+
 static void __exit pc110pad_exit(void)
 {
-        input_unregister_device(&pc110pad_dev); 
+        input_unregister_device(&pc110pad_dev);
 
         outb(PC110PAD_OFF, pc110pad_io + 2);