4 files changed, 7 insertions, 13 deletions

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index adef447f23ea..5ce632ca6815 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 5a7b49c35539..b10ffae7c39b 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/pcips2.c b/drivers/input/serio/pcips2.c
index ea5e3c6ddb62..1b404f9e3bff 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 d31ece8f68e9..2ad88780a170 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;