Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	drivers/macintosh/adbhid.c

8 files changed, 26 insertions, 27 deletions

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index adef447f23..5ce632ca68 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -21,7 +21,7 @@ if SERIO
 config SERIO_I8042
         tristate "i8042 PC Keyboard controller" if EMBEDDED || !X86
         default y
-        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K
+        depends on !PARISC && (!ARM || ARCH_SHARK || FOOTBRIDGE_HOST) && !M68K && !BFIN
         ---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,
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c
index 5a7b49c355..b10ffae7c3 100644
--- a/drivers/input/serio/ambakmi.c
+++ b/drivers/input/serio/ambakmi.c
@@ -117,15 +117,13 @@ static int amba_kmi_probe(struct amba_device *dev, void *id)
         if (ret)
                 return ret;
 
-        kmi = kmalloc(sizeof(struct amba_kmi_port), GFP_KERNEL);
-        io = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        kmi = kzalloc(sizeof(struct amba_kmi_port), GFP_KERNEL);
+        io = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!kmi || !io) {
                 ret = -ENOMEM;
                 goto out;
         }
 
-        memset(kmi, 0, sizeof(struct amba_kmi_port));
-        memset(io, 0, sizeof(struct serio));
 
         io->id.type     = SERIO_8042;
         io->write       = amba_kmi_write;
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c
index 74f14e0977..3e99df6be0 100644
--- a/drivers/input/serio/gscps2.c
+++ b/drivers/input/serio/gscps2.c
@@ -340,8 +340,8 @@ static int __init gscps2_probe(struct parisc_device *dev)
         if (dev->id.sversion == 0x96)
                 hpa += GSC_DINO_OFFSET;
 
-        ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL);
-        serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        ps2port = kzalloc(sizeof(struct gscps2port), GFP_KERNEL);
+        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!ps2port || !serio) {
                 ret = -ENOMEM;
                 goto fail_nomem;
@@ -349,8 +349,6 @@ static int __init gscps2_probe(struct parisc_device *dev)
 
         dev_set_drvdata(&dev->dev, ps2port);
 
-        memset(ps2port, 0, sizeof(struct gscps2port));
-        memset(serio, 0, sizeof(struct serio));
         ps2port->port = serio;
         ps2port->padev = dev;
         ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4);
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index 702a526cf4..f8fe421480 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -211,6 +211,16 @@ static struct dmi_system_id __initdata i8042_dmi_nomux_table[] = {
                 },
         },
         {
+                /*
+                 * Like DV4017EA does not raise AUXERR for errors on MUX ports.
+                 */
+                .ident = "HP Pavilion DV4270ca",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"),
+                },
+        },
+        {
                 .ident = "Toshiba P10",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c
index 42aa4ec726..11dafc0ee9 100644
--- a/drivers/input/serio/i8042.c
+++ b/drivers/input/serio/i8042.c
@@ -516,6 +516,7 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
 {
         unsigned long flags;
         unsigned char str, data;
+        int ret = 0;
 
         spin_lock_irqsave(&i8042_lock, flags);
         str = i8042_read_status();
@@ -524,10 +525,11 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
                 if (i8042_irq_being_tested &&
                     data == 0xa5 && (str & I8042_STR_AUXDATA))
                         complete(&i8042_aux_irq_delivered);
+                ret = 1;
         }
         spin_unlock_irqrestore(&i8042_lock, flags);
 
-        return IRQ_HANDLED;
+        return IRQ_RETVAL(ret);
 }
 
 /*
@@ -1042,7 +1044,7 @@ static void __devinit i8042_register_ports(void)
         }
 }
 
-static void __devinit i8042_unregister_ports(void)
+static void __devexit i8042_unregister_ports(void)
 {
         int i;
 
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c
index ea5e3c6ddb..1b404f9e3b 100644
--- a/drivers/input/serio/pcips2.c
+++ b/drivers/input/serio/pcips2.c
@@ -140,15 +140,13 @@ static int __devinit pcips2_probe(struct pci_dev *dev, const struct pci_device_i
         if (ret)
                 goto disable;
 
-        ps2if = kmalloc(sizeof(struct pcips2_data), GFP_KERNEL);
-        serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        ps2if = kzalloc(sizeof(struct pcips2_data), GFP_KERNEL);
+        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!ps2if || !serio) {
                 ret = -ENOMEM;
                 goto release;
         }
 
-        memset(ps2if, 0, sizeof(struct pcips2_data));
-        memset(serio, 0, sizeof(struct serio));
 
         serio->id.type          = SERIO_8042;
         serio->write            = pcips2_write;
diff --git a/drivers/input/serio/sa1111ps2.c b/drivers/input/serio/sa1111ps2.c
index d31ece8f68..2ad88780a1 100644
--- a/drivers/input/serio/sa1111ps2.c
+++ b/drivers/input/serio/sa1111ps2.c
@@ -234,15 +234,13 @@ static int __devinit ps2_probe(struct sa1111_dev *dev)
         struct serio *serio;
         int ret;
 
-        ps2if = kmalloc(sizeof(struct ps2if), GFP_KERNEL);
-        serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        ps2if = kzalloc(sizeof(struct ps2if), GFP_KERNEL);
+        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!ps2if || !serio) {
                 ret = -ENOMEM;
                 goto free;
         }
 
-        memset(ps2if, 0, sizeof(struct ps2if));
-        memset(serio, 0, sizeof(struct serio));
 
         serio->id.type          = SERIO_8042;
         serio->write            = ps2_write;
diff --git a/drivers/input/serio/serio.c b/drivers/input/serio/serio.c
index 372ca49311..b3bc15acd3 100644
--- a/drivers/input/serio/serio.c
+++ b/drivers/input/serio/serio.c
@@ -876,18 +876,14 @@ static int serio_bus_match(struct device *dev, struct device_driver *drv)
 
 #define SERIO_ADD_UEVENT_VAR(fmt, val...)                               \
         do {                                                            \
-                int err = add_uevent_var(envp, num_envp, &i,    \
-                                        buffer, buffer_size, &len,      \
-                                        fmt, val);                      \
+                int err = add_uevent_var(env, fmt, val);                \
                 if (err)                                                \
                         return err;                                     \
         } while (0)
 
-static int serio_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+static int serio_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         struct serio *serio;
-        int i = 0;
-        int len = 0;
 
         if (!dev)
                 return -ENODEV;
@@ -900,7 +896,6 @@ static int serio_uevent(struct device *dev, char **envp, int num_envp, char *buf
         SERIO_ADD_UEVENT_VAR("SERIO_EXTRA=%02x", serio->id.extra);
         SERIO_ADD_UEVENT_VAR("MODALIAS=serio:ty%02Xpr%02Xid%02Xex%02X",
                                 serio->id.type, serio->id.proto, serio->id.id, serio->id.extra);
-        envp[i] = NULL;
 
         return 0;
 }
@@ -908,7 +903,7 @@ static int serio_uevent(struct device *dev, char **envp, int num_envp, char *buf
 
 #else
 
-static int serio_uevent(struct device *dev, char **envp, int num_envp, char *buffer, int buffer_size)
+static int serio_uevent(struct device *dev, struct kobj_uevent_env *env)
 {
         return -ENODEV;
 }