Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: appletouch - implement reset-resume logic
  Input: i8042 - retry failed CTR writes when resuming
  Input: i8042 - add Fujitsu-Siemens Amilo Pro V2030 to nomux table
  Input: pcspkr - remove negative dependency on snd-pcsp

Manually fixed up trivial conflict in drivers/usb/core/quirks.c

5 files changed, 57 insertions, 11 deletions

diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index 3ad8bd9f7543..432699d61c58 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -15,7 +15,6 @@ if INPUT_MISC
 config INPUT_PCSPKR
         tristate "PC Speaker support"
         depends on PCSPKR_PLATFORM
-        depends on SND_PCSP=n
         help
           Say Y here if you want the standard PC Speaker to be used for
           bells and whistles.
diff --git a/drivers/input/mouse/appletouch.c b/drivers/input/mouse/appletouch.c
index 8dd3942f3022..ce6fdec19e14 100644
--- a/drivers/input/mouse/appletouch.c
+++ b/drivers/input/mouse/appletouch.c
@@ -589,6 +589,21 @@ static void atp_close(struct input_dev *input)
         dev->open = 0;
 }
 
+static int atp_handle_geyser(struct atp *dev)
+{
+        struct usb_device *udev = dev->udev;
+
+        if (!atp_is_fountain(dev)) {
+                /* switch to raw sensor mode */
+                if (atp_geyser_init(udev))
+                        return -EIO;
+
+                printk(KERN_INFO "appletouch: Geyser mode initialized.\n");
+        }
+
+        return 0;
+}
+
 static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id)
 {
         struct atp *dev;
@@ -633,14 +648,6 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id
         else
                 dev->datalen = 81;
 
-        if (!atp_is_fountain(dev)) {
-                /* switch to raw sensor mode */
-                if (atp_geyser_init(udev))
-                        goto err_free_devs;
-
-                printk(KERN_INFO "appletouch: Geyser mode initialized.\n");
-        }
-
         dev->urb = usb_alloc_urb(0, GFP_KERNEL);
         if (!dev->urb)
                 goto err_free_devs;
@@ -654,6 +661,10 @@ static int atp_probe(struct usb_interface *iface, const struct usb_device_id *id
                          usb_rcvintpipe(udev, int_in_endpointAddr),
                          dev->data, dev->datalen, atp_complete, dev, 1);
 
+        error = atp_handle_geyser(dev);
+        if (error)
+                goto err_free_buffer;
+
         usb_make_path(udev, dev->phys, sizeof(dev->phys));
         strlcat(dev->phys, "/input0", sizeof(dev->phys));
 
@@ -744,6 +755,20 @@ static void atp_disconnect(struct usb_interface *iface)
         printk(KERN_INFO "input: appletouch disconnected\n");
 }
 
+static int atp_recover(struct atp *dev)
+{
+        int error;
+
+        error = atp_handle_geyser(dev);
+        if (error)
+                return error;
+
+        if (dev->open && usb_submit_urb(dev->urb, GFP_ATOMIC))
+                return -EIO;
+
+        return 0;
+}
+
 static int atp_suspend(struct usb_interface *iface, pm_message_t message)
 {
         struct atp *dev = usb_get_intfdata(iface);
@@ -764,12 +789,20 @@ static int atp_resume(struct usb_interface *iface)
         return 0;
 }
 
+static int atp_reset_resume(struct usb_interface *iface)
+{
+        struct atp *dev = usb_get_intfdata(iface);
+
+        return atp_recover(dev);
+}
+
 static struct usb_driver atp_driver = {
         .name           = "appletouch",
         .probe          = atp_probe,
         .disconnect     = atp_disconnect,
         .suspend        = atp_suspend,
         .resume         = atp_resume,
+        .reset_resume   = atp_reset_resume,
         .id_table       = atp_table,
 };
 
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 9aafa96cb746..78eb7841174c 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -193,6 +193,13 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                 },
         },
         {
+                .ident = "Fujitsu-Siemens Amilo Pro 2030",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"),
+                },
+        },
+        {
                 /*
                  * No data is coming from the touchscreen unless KBC
                  * is in legacy mode.
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 592ff55b62d0..170f71ee5772 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -952,8 +952,12 @@ static int i8042_resume(struct platform_device *dev)
         i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS;
         i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT);
         if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
-                printk(KERN_ERR "i8042: Can't write CTR to resume\n");
-                return -EIO;
+                printk(KERN_WARNING "i8042: Can't write CTR to resume, retrying...\n");
+                msleep(50);
+                if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+                        printk(KERN_ERR "i8042: CTR write retry failed\n");
+                        return -EIO;
+                }
         }
 
 
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c
index 3da1ab4b389d..c070b34b669d 100644
--- a/drivers/usb/core/quirks.c
+++ b/drivers/usb/core/quirks.c
@@ -47,6 +47,9 @@ static const struct usb_device_id usb_quirk_list[] = {
         /* Edirol SD-20 */
         { USB_DEVICE(0x0582, 0x0027), .driver_info = USB_QUIRK_RESET_RESUME },
 
+        /* appletouch */
+        { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME },
+
         /* Avision AV600U */
         { USB_DEVICE(0x0638, 0x0a13), .driver_info =
           USB_QUIRK_STRING_FETCH_255 },