24 files changed, 281 insertions, 119 deletions
diff --git a/drivers/input/ff-core.c b/drivers/input/ff-core.c
index 72c63e5dd630..38df81fcdc3a 100644
--- a/drivers/input/ff-core.c
+++ b/drivers/input/ff-core.c
@@ -337,16 +337,16 @@ int input_ff_create(struct input_dev *dev, int max_effects)
        dev->ff = ff;
        dev->flush = flush_effects;
        dev->event = input_ff_event;
-        set_bit(EV_FF, dev->evbit);
+        __set_bit(EV_FF, dev->evbit);
        /* Copy "true" bits into ff device bitmap */
        for (i = 0; i <= FF_MAX; i++)
                if (test_bit(i, dev->ffbit))
-                        set_bit(i, ff->ffbit);
+                        __set_bit(i, ff->ffbit);
        /* we can emulate RUMBLE with periodic effects */
        if (test_bit(FF_PERIODIC, ff->ffbit))
-                set_bit(FF_RUMBLE, dev->ffbit);
+                __set_bit(FF_RUMBLE, dev->ffbit);
        return 0;
 }
@@ -362,12 +362,14 @@ EXPORT_SYMBOL_GPL(input_ff_create);
 */
 void input_ff_destroy(struct input_dev *dev)
 {
-        clear_bit(EV_FF, dev->evbit);
+        struct ff_device *ff = dev->ff;
-        if (dev->ff) {
-                if (dev->ff->destroy)
+        __clear_bit(EV_FF, dev->evbit);
-                        dev->ff->destroy(dev->ff);
+        if (ff) {
-                kfree(dev->ff->private);
+                if (ff->destroy)
-                kfree(dev->ff);
+                        ff->destroy(ff);
+                kfree(ff->private);
+                kfree(ff);
                dev->ff = NULL;
        }
 }
diff --git a/drivers/input/ff-memless.c b/drivers/input/ff-memless.c
index 2d1415e16834..b483b2995fa9 100644
--- a/drivers/input/ff-memless.c
+++ b/drivers/input/ff-memless.c
@@ -61,7 +61,6 @@ struct ml_device {
        struct ml_effect_state states[FF_MEMLESS_EFFECTS];
        int gain;
        struct timer_list timer;
-        spinlock_t timer_lock;
        struct input_dev *dev;
        int (*play_effect)(struct input_dev *dev, void *data,
@@ -368,38 +367,38 @@ static void ml_effect_timer(unsigned long timer_data)
 {
        struct input_dev *dev = (struct input_dev *)timer_data;
        struct ml_device *ml = dev->ff->private;
+        unsigned long flags;
        debug("timer: updating effects");
-        spin_lock(&ml->timer_lock);
+        spin_lock_irqsave(&dev->event_lock, flags);
        ml_play_effects(ml);
-        spin_unlock(&ml->timer_lock);
+        spin_unlock_irqrestore(&dev->event_lock, flags);
 }
+/*
+ * Sets requested gain for FF effects. Called with dev->event_lock held.
+ */
 static void ml_ff_set_gain(struct input_dev *dev, u16 gain)
 {
        struct ml_device *ml = dev->ff->private;
        int i;
-        spin_lock_bh(&ml->timer_lock);
        ml->gain = gain;
        for (i = 0; i < FF_MEMLESS_EFFECTS; i++)
                __clear_bit(FF_EFFECT_PLAYING, &ml->states[i].flags);
        ml_play_effects(ml);
-        spin_unlock_bh(&ml->timer_lock);
 }
+/*
+ * Start/stop specified FF effect. Called with dev->event_lock held.
+ */
 static int ml_ff_playback(struct input_dev *dev, int effect_id, int value)
 {
        struct ml_device *ml = dev->ff->private;
        struct ml_effect_state *state = &ml->states[effect_id];
-        unsigned long flags;
-        spin_lock_irqsave(&ml->timer_lock, flags);
        if (value > 0) {
                debug("initiated play");
@@ -425,8 +424,6 @@ static int ml_ff_playback(struct input_dev *dev, int effect_id, int value)
                ml_play_effects(ml);
        }
-        spin_unlock_irqrestore(&ml->timer_lock, flags);
        return 0;
 }
@@ -436,7 +433,7 @@ static int ml_ff_upload(struct input_dev *dev,
        struct ml_device *ml = dev->ff->private;
        struct ml_effect_state *state = &ml->states[effect->id];
-        spin_lock_bh(&ml->timer_lock);
+        spin_lock_irq(&dev->event_lock);
        if (test_bit(FF_EFFECT_STARTED, &state->flags)) {
                __clear_bit(FF_EFFECT_PLAYING, &state->flags);
@@ -448,7 +445,7 @@ static int ml_ff_upload(struct input_dev *dev,
                ml_schedule_timer(ml);
        }
-        spin_unlock_bh(&ml->timer_lock);
+        spin_unlock_irq(&dev->event_lock);
        return 0;
 }
@@ -482,7 +479,6 @@ int input_ff_create_memless(struct input_dev *dev, void *data,
        ml->private = data;
        ml->play_effect = play_effect;
        ml->gain = 0xffff;
-        spin_lock_init(&ml->timer_lock);
        setup_timer(&ml->timer, ml_effect_timer, (unsigned long)dev);
        set_bit(FF_GAIN, dev->ffbit);
diff --git a/drivers/input/input.c b/drivers/input/input.c
index c6f88ebb40c7..2266ecbfbc01 100644
--- a/drivers/input/input.c
+++ b/drivers/input/input.c
@@ -782,10 +782,29 @@ static unsigned int input_proc_devices_poll(struct file *file, poll_table *wait)
        return 0;
 }
+union input_seq_state {
+        struct {
+                unsigned short pos;
+                bool mutex_acquired;
+        };
+        void *p;
+};
 static void *input_devices_seq_start(struct seq_file *seq, loff_t *pos)
 {
-        if (mutex_lock_interruptible(&input_mutex))
+        union input_seq_state *state = (union input_seq_state *)&seq->private;
-                return NULL;
+        int error;
+        /* We need to fit into seq->private pointer */
+        BUILD_BUG_ON(sizeof(union input_seq_state) != sizeof(seq->private));
+        error = mutex_lock_interruptible(&input_mutex);
+        if (error) {
+                state->mutex_acquired = false;
+                return ERR_PTR(error);
+        }
+        state->mutex_acquired = true;
        return seq_list_start(&input_dev_list, *pos);
 }
@@ -795,9 +814,12 @@ static void *input_devices_seq_next(struct seq_file *seq, void *v, loff_t *pos)
        return seq_list_next(v, &input_dev_list, pos);
 }
-static void input_devices_seq_stop(struct seq_file *seq, void *v)
+static void input_seq_stop(struct seq_file *seq, void *v)
 {
-        mutex_unlock(&input_mutex);
+        union input_seq_state *state = (union input_seq_state *)&seq->private;
+        if (state->mutex_acquired)
+                mutex_unlock(&input_mutex);
 }
 static void input_seq_print_bitmap(struct seq_file *seq, const char *name,
@@ -861,7 +883,7 @@ static int input_devices_seq_show(struct seq_file *seq, void *v)
 static const struct seq_operations input_devices_seq_ops = {
        .start  = input_devices_seq_start,
        .next   = input_devices_seq_next,
-        .stop   = input_devices_seq_stop,
+        .stop   = input_seq_stop,
        .show   = input_devices_seq_show,
 };
@@ -881,40 +903,49 @@ static const struct file_operations input_devices_fileops = {
 static void *input_handlers_seq_start(struct seq_file *seq, loff_t *pos)
 {
-        if (mutex_lock_interruptible(&input_mutex))
+        union input_seq_state *state = (union input_seq_state *)&seq->private;
-                return NULL;
+        int error;
+        /* We need to fit into seq->private pointer */
+        BUILD_BUG_ON(sizeof(union input_seq_state) != sizeof(seq->private));
+        error = mutex_lock_interruptible(&input_mutex);
+        if (error) {
+                state->mutex_acquired = false;
+                return ERR_PTR(error);
+        }
+        state->mutex_acquired = true;
+        state->pos = *pos;
-        seq->private = (void *)(unsigned long)*pos;
        return seq_list_start(&input_handler_list, *pos);
 }
 static void *input_handlers_seq_next(struct seq_file *seq, void *v, loff_t *pos)
 {
-        seq->private = (void *)(unsigned long)(*pos + 1);
+        union input_seq_state *state = (union input_seq_state *)&seq->private;
-        return seq_list_next(v, &input_handler_list, pos);
-}
-static void input_handlers_seq_stop(struct seq_file *seq, void *v)
+        state->pos = *pos + 1;
-{
+        return seq_list_next(v, &input_handler_list, pos);
-        mutex_unlock(&input_mutex);
 }
 static int input_handlers_seq_show(struct seq_file *seq, void *v)
 {
        struct input_handler *handler = container_of(v, struct input_handler, node);
+        union input_seq_state *state = (union input_seq_state *)&seq->private;
-        seq_printf(seq, "N: Number=%ld Name=%s",
+        seq_printf(seq, "N: Number=%u Name=%s", state->pos, handler->name);
-                   (unsigned long)seq->private, handler->name);
        if (handler->fops)
                seq_printf(seq, " Minor=%d", handler->minor);
        seq_putc(seq, '\n');
        return 0;
 }
 static const struct seq_operations input_handlers_seq_ops = {
        .start  = input_handlers_seq_start,
        .next   = input_handlers_seq_next,
-        .stop   = input_handlers_seq_stop,
+        .stop   = input_seq_stop,
        .show   = input_handlers_seq_show,
 };
@@ -1261,17 +1292,24 @@ static int input_dev_uevent(struct device *device, struct kobj_uevent_env *env)
        return 0;
 }
-#define INPUT_DO_TOGGLE(dev, type, bits, on)                    \
+#define INPUT_DO_TOGGLE(dev, type, bits, on)                            \
-        do {                                                    \
+        do {                                                            \
-                int i;                                          \
+                int i;                                                  \
-                if (!test_bit(EV_##type, dev->evbit))           \
+                bool active;                                            \
-                        break;                                  \
+                                                                        \
-                for (i = 0; i < type##_MAX; i++) {              \
+                if (!test_bit(EV_##type, dev->evbit))                   \
-                        if (!test_bit(i, dev->bits##bit) ||     \
+                        break;                                          \
-                            !test_bit(i, dev->bits))            \
+                                                                        \
-                                continue;                       \
+                for (i = 0; i < type##_MAX; i++) {                      \
-                        dev->event(dev, EV_##type, i, on);      \
+                        if (!test_bit(i, dev->bits##bit))               \
-                }                                               \
+                                continue;                               \
+                                                                        \
+                        active = test_bit(i, dev->bits);                \
+                        if (!active && !on)                             \
+                                continue;                               \
+                                                                        \
+                        dev->event(dev, EV_##type, i, on ? active : 0); \
+                }                                                       \
        } while (0)
 #ifdef CONFIG_PM
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c
index 2388cf578a62..79e3edcced1a 100644
--- a/drivers/input/joystick/xpad.c
+++ b/drivers/input/joystick/xpad.c
@@ -143,6 +143,7 @@ static const struct xpad_device {
        { 0x12ab, 0x8809, "Xbox DDR dancepad", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
        { 0x1430, 0x4748, "RedOctane Guitar Hero X-plorer", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
        { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX },
+        { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
        { 0x045e, 0x028e, "Microsoft X-Box 360 pad", MAP_DPAD_TO_AXES, XTYPE_XBOX360 },
        { 0x1bad, 0x0003, "Harmonix Rock Band Drumkit", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX360 },
        { 0xffff, 0xffff, "Chinese-made Xbox Controller", MAP_DPAD_TO_AXES, XTYPE_XBOX },
@@ -209,6 +210,7 @@ static struct usb_device_id xpad_table [] = {
        XPAD_XBOX360_VENDOR(0x0738),            /* Mad Catz X-Box 360 controllers */
        XPAD_XBOX360_VENDOR(0x0e6f),            /* 0x0e6f X-Box 360 controllers */
        XPAD_XBOX360_VENDOR(0x1430),            /* RedOctane X-Box 360 controllers */
+        XPAD_XBOX360_VENDOR(0x146b),            /* BigBen Interactive Controllers */
        XPAD_XBOX360_VENDOR(0x1bad),            /* Rock Band Drums */
        { }
 };
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 4709e15af607..28e6110d1ff8 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -233,6 +233,7 @@ struct atkbd {
 */
 static void (*atkbd_platform_fixup)(struct atkbd *, const void *data);
 static void *atkbd_platform_fixup_data;
+static unsigned int (*atkbd_platform_scancode_fixup)(struct atkbd *, unsigned int);
 static ssize_t atkbd_attr_show_helper(struct device *dev, char *buf,
                                ssize_t (*handler)(struct atkbd *, char *));
@@ -393,6 +394,9 @@ static irqreturn_t atkbd_interrupt(struct serio *serio, unsigned char data,
        input_event(dev, EV_MSC, MSC_RAW, code);
+        if (atkbd_platform_scancode_fixup)
+                code = atkbd_platform_scancode_fixup(atkbd, code);
        if (atkbd->translated) {
                if (atkbd->emul || atkbd_need_xlate(atkbd->xl_bit, code)) {
@@ -574,11 +578,22 @@ static void atkbd_event_work(struct work_struct *work)
        mutex_lock(&atkbd->event_mutex);
-        if (test_and_clear_bit(ATKBD_LED_EVENT_BIT, &atkbd->event_mask))
+        if (!atkbd->enabled) {
-                atkbd_set_leds(atkbd);
+                /*
+                 * Serio ports are resumed asynchronously so while driver core
+                 * thinks that device is already fully operational in reality
+                 * it may not be ready yet. In this case we need to keep
+                 * rescheduling till reconnect completes.
+                 */
+                schedule_delayed_work(&atkbd->event_work,
+                                        msecs_to_jiffies(100));
+        } else {
+                if (test_and_clear_bit(ATKBD_LED_EVENT_BIT, &atkbd->event_mask))
+                        atkbd_set_leds(atkbd);
-        if (test_and_clear_bit(ATKBD_REP_EVENT_BIT, &atkbd->event_mask))
+                if (test_and_clear_bit(ATKBD_REP_EVENT_BIT, &atkbd->event_mask))
-                atkbd_set_repeat_rate(atkbd);
+                        atkbd_set_repeat_rate(atkbd);
+        }
        mutex_unlock(&atkbd->event_mutex);
 }
@@ -770,6 +785,30 @@ static int atkbd_select_set(struct atkbd *atkbd, int target_set, int allow_extra
        return 3;
 }
+static int atkbd_reset_state(struct atkbd *atkbd)
+{
+        struct ps2dev *ps2dev = &atkbd->ps2dev;
+        unsigned char param[1];
+/*
+ * Set the LEDs to a predefined state (all off).
+ */
+        param[0] = 0;
+        if (ps2_command(ps2dev, param, ATKBD_CMD_SETLEDS))
+                return -1;
+/*
+ * Set autorepeat to fastest possible.
+ */
+        param[0] = 0;
+        if (ps2_command(ps2dev, param, ATKBD_CMD_SETREP))
+                return -1;
+        return 0;
+}
 static int atkbd_activate(struct atkbd *atkbd)
 {
        struct ps2dev *ps2dev = &atkbd->ps2dev;
@@ -852,29 +891,6 @@ static unsigned int atkbd_hp_forced_release_keys[] = {
 };
 /*
- * Inventec system with broken key release on volume keys
- */
-static unsigned int atkbd_inventec_forced_release_keys[] = {
-        0xae, 0xb0, -1U
-};
-/*
- * Perform fixup for HP Pavilion ZV6100 laptop that doesn't generate release
- * for its volume buttons
- */
-static unsigned int atkbd_hp_zv6100_forced_release_keys[] = {
-        0xae, 0xb0, -1U
-};
-/*
- * Perform fixup for HP (Compaq) Presario R4000 R4100 R4200 that don't generate
- * release for their volume buttons
- */
-static unsigned int atkbd_hp_r4000_forced_release_keys[] = {
-        0xae, 0xb0, -1U
-};
-/*
 * Samsung NC10,NC20 with Fn+F? key release not working
 */
 static unsigned int atkbd_samsung_forced_release_keys[] = {
@@ -882,14 +898,6 @@ static unsigned int atkbd_samsung_forced_release_keys[] = {
 };
 /*
- * The volume up and volume down special keys on a Fujitsu Amilo PA 1510 laptop
- * do not generate release events so we have to do it ourselves.
- */
-static unsigned int atkbd_amilo_pa1510_forced_release_keys[] = {
-        0xb0, 0xae, -1U
-};
-/*
 * Amilo Pi 3525 key release for Fn+Volume keys not working
 */
 static unsigned int atkbd_amilo_pi3525_forced_release_keys[] = {
@@ -911,6 +919,30 @@ static unsigned int atkdb_soltech_ta12_forced_release_keys[] = {
 };
 /*
+ * Many notebooks don't send key release event for volume up/down
+ * keys, with key list below common among them
+ */
+static unsigned int atkbd_volume_forced_release_keys[] = {
+        0xae, 0xb0, -1U
+};
+/*
+ * OQO 01+ multimedia keys (64--66) generate e0 6x upon release whereas
+ * they should be generating e4-e6 (0x80 | code).
+ */
+static unsigned int atkbd_oqo_01plus_scancode_fixup(struct atkbd *atkbd,
+                                                    unsigned int code)
+{
+        if (atkbd->translated && atkbd->emul == 1 &&
+            (code == 0x64 || code == 0x65 || code == 0x66)) {
+                atkbd->emul = 0;
+                code |= 0x80;
+        }
+        return code;
+}
+/*
 * atkbd_set_keycode_table() initializes keyboard's keycode table
 * according to the selected scancode set
 */
@@ -1087,6 +1119,7 @@ static int atkbd_connect(struct serio *serio, struct serio_driver *drv)
                }
                atkbd->set = atkbd_select_set(atkbd, atkbd_set, atkbd_extra);
+                atkbd_reset_state(atkbd);
                atkbd_activate(atkbd);
        } else {
@@ -1141,6 +1174,18 @@ static int atkbd_reconnect(struct serio *serio)
                        return -1;
                atkbd_activate(atkbd);
+                /*
+                 * Restore LED state and repeat rate. While input core
+                 * will do this for us at resume time reconnect may happen
+                 * because user requested it via sysfs or simply because
+                 * keyboard was unplugged and plugged in again so we need
+                 * to do it ourselves here.
+                 */
+                atkbd_set_leds(atkbd);
+                if (!atkbd->softrepeat)
+                        atkbd_set_repeat_rate(atkbd);
        }
        atkbd_enable(atkbd);
@@ -1267,6 +1312,7 @@ static ssize_t atkbd_set_extra(struct atkbd *atkbd, const char *buf, size_t coun
                atkbd->dev = new_dev;
                atkbd->set = atkbd_select_set(atkbd, atkbd->set, value);
+                atkbd_reset_state(atkbd);
                atkbd_activate(atkbd);
                atkbd_set_keycode_table(atkbd);
                atkbd_set_device_attrs(atkbd);
@@ -1388,6 +1434,7 @@ static ssize_t atkbd_set_set(struct atkbd *atkbd, const char *buf, size_t count)
                atkbd->dev = new_dev;
                atkbd->set = atkbd_select_set(atkbd, value, atkbd->extra);
+                atkbd_reset_state(atkbd);
                atkbd_activate(atkbd);
                atkbd_set_keycode_table(atkbd);
                atkbd_set_device_attrs(atkbd);
@@ -1513,6 +1560,13 @@ static int __init atkbd_setup_forced_release(const struct dmi_system_id *id)
        return 0;
 }
+static int __init atkbd_setup_scancode_fixup(const struct dmi_system_id *id)
+{
+        atkbd_platform_scancode_fixup = id->driver_data;
+        return 0;
+}
 static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
        {
                .ident = "Dell Laptop",
@@ -1548,7 +1602,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion ZV6100"),
                },
                .callback = atkbd_setup_forced_release,
-                .driver_data = atkbd_hp_zv6100_forced_release_keys,
+                .driver_data = atkbd_volume_forced_release_keys,
        },
        {
                .ident = "HP Presario R4000",
@@ -1557,7 +1611,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4000"),
                },
                .callback = atkbd_setup_forced_release,
-                .driver_data = atkbd_hp_r4000_forced_release_keys,
+                .driver_data = atkbd_volume_forced_release_keys,
        },
        {
                .ident = "HP Presario R4100",
@@ -1566,7 +1620,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4100"),
                },
                .callback = atkbd_setup_forced_release,
-                .driver_data = atkbd_hp_r4000_forced_release_keys,
+                .driver_data = atkbd_volume_forced_release_keys,
        },
        {
                .ident = "HP Presario R4200",
@@ -1575,7 +1629,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "Presario R4200"),
                },
                .callback = atkbd_setup_forced_release,
-                .driver_data = atkbd_hp_r4000_forced_release_keys,
+                .driver_data = atkbd_volume_forced_release_keys,
        },
        {
                .ident = "Inventec Symphony",
@@ -1584,7 +1638,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "SYMPHONY 6.0/7.0"),
                },
                .callback = atkbd_setup_forced_release,
-                .driver_data = atkbd_inventec_forced_release_keys,
+                .driver_data = atkbd_volume_forced_release_keys,
        },
        {
                .ident = "Samsung NC10",
@@ -1620,7 +1674,7 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pa 1510"),
                },
                .callback = atkbd_setup_forced_release,
-                .driver_data = atkbd_amilo_pa1510_forced_release_keys,
+                .driver_data = atkbd_volume_forced_release_keys,
        },
        {
                .ident = "Fujitsu Amilo Pi 3525",
@@ -1649,6 +1703,15 @@ static struct dmi_system_id atkbd_dmi_quirk_table[] __initdata = {
                .callback = atkbd_setup_forced_release,
                .driver_data = atkdb_soltech_ta12_forced_release_keys,
        },
+        {
+                .ident = "OQO Model 01+",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "OQO"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "ZEPTO"),
+                },
+                .callback = atkbd_setup_scancode_fixup,
+                .driver_data = atkbd_oqo_01plus_scancode_fixup,
+        },
        { }
 };
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index a88aff3816a0..77d130914259 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -147,6 +147,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
                }
                error = request_irq(irq, gpio_keys_isr,
+                                    IRQF_SHARED |
                                    IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,
                                    button->desc ? button->desc : "gpio_keys",
                                    bdata);
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index e9d639ec283d..5f72440b50c8 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -24,6 +24,7 @@
 #include <linux/interrupt.h>
 #include <linux/hil.h>
 #include <linux/io.h>
+#include <linux/sched.h>
 #include <linux/spinlock.h>
 #include <asm/irq.h>
 #ifdef CONFIG_HP300
diff --git a/drivers/input/keyboard/sunkbd.c b/drivers/input/keyboard/sunkbd.c
index 472b56639cdb..a99a04b03ee4 100644
--- a/drivers/input/keyboard/sunkbd.c
+++ b/drivers/input/keyboard/sunkbd.c
@@ -27,6 +27,7 @@
 */
 #include <linux/delay.h>
+#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/interrupt.h>
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 02f4f8f1db6f..a9bb2544b2de 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -227,6 +227,7 @@ config INPUT_WINBOND_CIR
        depends on X86 && PNP
        select NEW_LEDS
        select LEDS_CLASS
+        select LEDS_TRIGGERS
        select BITREVERSE
        help
          Say Y here if you want to use the IR remote functionality found
diff --git a/drivers/input/misc/hp_sdc_rtc.c b/drivers/input/misc/hp_sdc_rtc.c
index 216a559f55ea..ea821b546969 100644
--- a/drivers/input/misc/hp_sdc_rtc.c
+++ b/drivers/input/misc/hp_sdc_rtc.c
@@ -209,7 +209,7 @@ static inline int hp_sdc_rtc_read_rt(struct timeval *res) {
 /* Read the i8042 fast handshake timer */
 static inline int hp_sdc_rtc_read_fhs(struct timeval *res) {
-        uint64_t raw;
+        int64_t raw;
        unsigned int tenms;
        raw = hp_sdc_rtc_read_i8042timer(HP_SDC_CMD_LOAD_FHS, 2);
diff --git a/drivers/input/misc/rotary_encoder.c b/drivers/input/misc/rotary_encoder.c
index c806fbf1e174..3b9f588fc747 100644
--- a/drivers/input/misc/rotary_encoder.c
+++ b/drivers/input/misc/rotary_encoder.c
@@ -106,8 +106,8 @@ static int __devinit rotary_encoder_probe(struct platform_device *pdev)
        struct input_dev *input;
        int err;
-        if (!pdata || !pdata->steps) {
+        if (!pdata) {
-                dev_err(&pdev->dev, "invalid platform data\n");
+                dev_err(&pdev->dev, "missing platform data\n");
                return -ENOENT;
        }
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index c4f42311fdec..b064419b90a2 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -230,7 +230,7 @@ out_err:
        return err;
 }
-static int bbc_remove(struct of_device *op)
+static int __devexit bbc_remove(struct of_device *op)
 {
        struct sparcspkr_state *state = dev_get_drvdata(&op->dev);
        struct input_dev *input_dev = state->input_dev;
@@ -308,7 +308,7 @@ out_err:
        return err;
 }
-static int grover_remove(struct of_device *op)
+static int __devexit grover_remove(struct of_device *op)
 {
        struct sparcspkr_state *state = dev_get_drvdata(&op->dev);
        struct grover_beep_info *info = &state->u.grover;
diff --git a/drivers/input/misc/wistron_btns.c b/drivers/input/misc/wistron_btns.c
index 11fd038a078f..a932179c4c9e 100644
--- a/drivers/input/misc/wistron_btns.c
+++ b/drivers/input/misc/wistron_btns.c
@@ -936,6 +936,15 @@ static struct dmi_system_id dmi_ids[] __initdata = {
        },
        {
                .callback = dmi_matched,
+                .ident = "Medion MD 42200",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Medion"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2030"),
+                },
+                .driver_data = keymap_fs_amilo_pro_v2000
+        },
+        {
+                .callback = dmi_matched,
                .ident = "Medion MD 96500",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"),
diff --git a/drivers/input/mouse/lifebook.c b/drivers/input/mouse/lifebook.c
index 5e6308694408..82811558ec33 100644
--- a/drivers/input/mouse/lifebook.c
+++ b/drivers/input/mouse/lifebook.c
@@ -107,8 +107,7 @@ static const struct dmi_system_id lifebook_dmi_table[] = {
                .matches = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "CF-72"),
                },
-                .callback = lifebook_set_serio_phys,
+                .callback = lifebook_set_6byte_proto,
-                .driver_data = "isa0060/serio3",
        },
        {
                .ident = "Lifebook B142",
diff --git a/drivers/input/mouse/logips2pp.c b/drivers/input/mouse/logips2pp.c
index de745d751162..ab5dc5f5fd83 100644
--- a/drivers/input/mouse/logips2pp.c
+++ b/drivers/input/mouse/logips2pp.c
@@ -219,7 +219,7 @@ static const struct ps2pp_info *get_model_info(unsigned char model)
                                PS2PP_WHEEL | PS2PP_SIDE_BTN | PS2PP_TASK_BTN |
                                PS2PP_EXTRA_BTN | PS2PP_NAV_BTN | PS2PP_HWHEEL },
                { 72,   PS2PP_KIND_TRACKMAN,    0 },                    /* T-CH11: TrackMan Marble */
-                { 73,   0,                      PS2PP_SIDE_BTN },
+                { 73,   PS2PP_KIND_TRACKMAN,    PS2PP_SIDE_BTN },       /* TrackMan FX */
                { 75,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
                { 76,   PS2PP_KIND_WHEEL,       PS2PP_WHEEL },
                { 79,   PS2PP_KIND_TRACKMAN,    PS2PP_WHEEL },          /* TrackMan with wheel */
diff --git a/drivers/input/mouse/psmouse-base.c b/drivers/input/mouse/psmouse-base.c
index 690aed905436..07c53798301a 100644
--- a/drivers/input/mouse/psmouse-base.c
+++ b/drivers/input/mouse/psmouse-base.c
@@ -581,7 +581,7 @@ static int cortron_detect(struct psmouse *psmouse, bool set_properties)
 static int psmouse_extensions(struct psmouse *psmouse,
                              unsigned int max_proto, bool set_properties)
 {
-        bool synaptics_hardware = true;
+        bool synaptics_hardware = false;
 /*
 * We always check for lifebook because it does not disturb mouse
@@ -1673,7 +1673,7 @@ static int psmouse_get_maxproto(char *buffer, struct kernel_param *kp)
 {
        int type = *((unsigned int *)kp->arg);
-        return sprintf(buffer, "%s\n", psmouse_protocol_by_type(type)->name);
+        return sprintf(buffer, "%s", psmouse_protocol_by_type(type)->name);
 }
 static int __init psmouse_init(void)
diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index b66ff1ac7dea..f4a61252bcc9 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -652,6 +652,16 @@ static const struct dmi_system_id toshiba_dmi_table[] = {
                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
                        DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
                },
+        },
+        {
+                .ident = "Toshiba Portege M300",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Portable PC"),
+                        DMI_MATCH(DMI_PRODUCT_VERSION, "Version 1.0"),
+                },
        },
        { }
 };
diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index c4b3fbd1a80f..aa533ceffe34 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -4,7 +4,7 @@
 config SERIO
        tristate "Serial I/O support" if EMBEDDED || !X86
        default y
-        ---help---
+        help
          Say Yes here if you have any input device that uses serial I/O to
          communicate with the system. This includes the
                        * standard AT keyboard and PS/2 mouse *
@@ -22,7 +22,7 @@ config SERIO_I8042
        tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
        default y
        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BLACKFIN
-        ---help---
+        help
          i8042 is the chip over which the standard AT keyboard and PS/2
          mouse are connected to the computer. If you use these devices,
          you'll need to say Y here.
@@ -35,7 +35,7 @@ config SERIO_I8042
 config SERIO_SERPORT
        tristate "Serial port line discipline"
        default y
-        ---help---
+        help
          Say Y here if you plan to use an input device (mouse, joystick,
          tablet, 6dof) that communicates over the RS232 serial (COM) port.
@@ -49,7 +49,7 @@ config SERIO_SERPORT
 config SERIO_CT82C710
        tristate "ct82c710 Aux port controller"
        depends on X86
-        ---help---
+        help
          Say Y here if you have a Texas Instruments TravelMate notebook
          equipped with the ct82c710 chip and want to use a mouse connected
          to the "QuickPort".
@@ -66,7 +66,7 @@ config SERIO_Q40KBD
 config SERIO_PARKBD
        tristate "Parallel port keyboard adapter"
        depends on PARPORT
-        ---help---
+        help
          Say Y here if you built a simple parallel port adapter to attach
          an additional AT keyboard, XT keyboard or PS/2 mouse.
@@ -124,7 +124,7 @@ config HP_SDC
        tristate "HP System Device Controller i8042 Support"
        depends on (GSC || HP300) && SERIO
        default y
-        ---help---
+        help
          This option enables support for the "System Device
          Controller", an i8042 carrying microcode to manage a
          few miscellaneous devices on some Hewlett Packard systems.
@@ -168,6 +168,7 @@ config SERIO_MACEPS2
 config SERIO_LIBPS2
        tristate "PS/2 driver library" if EMBEDDED
+        depends on SERIO_I8042 || SERIO_I8042=n
        help
          Say Y here if you are using a driver for device connected
          to a PS/2 port, such as PS/2 mouse or standard AT keyboard.
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index a39bc4eb902b..a537925f7651 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -327,6 +327,17 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                },
        },
        {
+                /*
+                 * Reset and GET ID commands issued via KBD port are
+                 * sometimes being delivered to AUX3.
+                 */
+                .ident = "Sony Vaio FZ-240E",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ240E"),
+                },
+        },
+        {
                .ident = "Amoi M636/A737",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Amoi Electronics CO.,LTD."),
@@ -661,7 +672,7 @@ static void i8042_pnp_exit(void)
 static int __init i8042_pnp_init(void)
 {
        char kbd_irq_str[4] = { 0 }, aux_irq_str[4] = { 0 };
-        int pnp_data_busted = false;
+        bool pnp_data_busted = false;
        int err;
 #ifdef CONFIG_X86
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index bc56e52b945f..1df02d25aca5 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -609,6 +609,8 @@ static irqreturn_t __init i8042_aux_test_irq(int irq, void *dev_id)
        str = i8042_read_status();
        if (str & I8042_STR_OBF) {
                data = i8042_read_data();
+                dbg("%02x <- i8042 (aux_test_irq, %s)",
+                        data, str & I8042_STR_AUXDATA ? "aux" : "kbd");
                if (i8042_irq_being_tested &&
                    data == 0xa5 && (str & I8042_STR_AUXDATA))
                        complete(&i8042_aux_irq_delivered);
@@ -750,6 +752,7 @@ static int __init i8042_check_aux(void)
 * AUX IRQ was never delivered so we need to flush the controller to
 * get rid of the byte we put there; otherwise keyboard may not work.
 */
+                dbg("     -- i8042 (aux irq test timeout)");
                i8042_flush();
                retval = -1;
        }
@@ -833,17 +836,32 @@ static int i8042_controller_selftest(void)
 static int i8042_controller_init(void)
 {
        unsigned long flags;
+        int n = 0;
+        unsigned char ctr[2];
 /*
- * Save the CTR for restoral on unload / reboot.
+ * Save the CTR for restore on unload / reboot.
 */
-        if (i8042_command(&i8042_ctr, I8042_CMD_CTL_RCTR)) {
+        do {
-                printk(KERN_ERR "i8042.c: Can't read CTR while initializing i8042.\n");
+                if (n >= 10) {
-                return -EIO;
+                        printk(KERN_ERR
-        }
+                                "i8042.c: Unable to get stable CTR read.\n");
+                        return -EIO;
+                }
+                if (n != 0)
+                        udelay(50);
+                if (i8042_command(&ctr[n++ % 2], I8042_CMD_CTL_RCTR)) {
+                        printk(KERN_ERR
+                                "i8042.c: Can't read CTR while initializing i8042.\n");
+                        return -EIO;
+                }
-        i8042_initial_ctr = i8042_ctr;
+        } while (n < 2 || ctr[0] != ctr[1]);
+        i8042_initial_ctr = i8042_ctr = ctr[0];
 /*
 * Disable the keyboard interface and interrupt.
@@ -892,6 +910,12 @@ static int i8042_controller_init(void)
                return -EIO;
        }
+/*
+ * Flush whatever accumulated while we were disabling keyboard port.
+ */
+        i8042_flush();
        return 0;
 }
@@ -911,7 +935,7 @@ static void i8042_controller_reset(void)
        i8042_ctr |= I8042_CTR_KBDDIS | I8042_CTR_AUXDIS;
        i8042_ctr &= ~(I8042_CTR_KBDINT | I8042_CTR_AUXINT);
-        if (i8042_command(&i8042_initial_ctr, I8042_CMD_CTL_WCTR))
+        if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
                printk(KERN_WARNING "i8042.c: Can't write CTR while resetting.\n");
 /*
diff --git a/drivers/input/serio/libps2.c b/drivers/input/serio/libps2.c
index 769ba65a585a..f3876acc3e83 100644
--- a/drivers/input/serio/libps2.c
+++ b/drivers/input/serio/libps2.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/interrupt.h>
 #include <linux/input.h>
diff --git a/drivers/input/serio/serio_raw.c b/drivers/input/serio/serio_raw.c
index b03009bb7468..27fdaaffbb40 100644
--- a/drivers/input/serio/serio_raw.c
+++ b/drivers/input/serio/serio_raw.c
@@ -9,6 +9,7 @@
 * the Free Software Foundation.
 */
+#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/smp_lock.h>
 #include <linux/poll.h>
diff --git a/drivers/input/serio/serport.c b/drivers/input/serio/serport.c
index b9694b6445d0..6d345112bcb7 100644
--- a/drivers/input/serio/serport.c
+++ b/drivers/input/serio/serport.c
@@ -15,6 +15,7 @@
 #include <asm/uaccess.h>
 #include <linux/kernel.h>
+#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index f06332c9e21b..c21e6d3a8844 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -645,7 +645,7 @@ static int __devinit ad7879_probe(struct spi_device *spi)
                kfree(ts);
        }
-        return 0;
+        return error;
 }
 static int __devexit ad7879_remove(struct spi_device *spi)
@@ -732,7 +732,7 @@ static int __devinit ad7879_probe(struct i2c_client *client,
                kfree(ts);
        }
-        return 0;
+        return error;
 }
 static int __devexit ad7879_remove(struct i2c_client *client)