1 files changed, 11 insertions, 7 deletions

diff --git a/drivers/input/mouse/synaptics.c b/drivers/input/mouse/synaptics.c
index 2051bec2c394..ad5d0a85e960 100644
--- a/drivers/input/mouse/synaptics.c
+++ b/drivers/input/mouse/synaptics.c
@@ -247,14 +247,12 @@ static void synaptics_pt_create(struct psmouse *psmouse)
 {
         struct serio *serio;
 
-        serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
+        serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
         if (!serio) {
                 printk(KERN_ERR "synaptics: not enough memory to allocate pass-through port\n");
                 return;
         }
 
-        memset(serio, 0, sizeof(struct serio));
-
         serio->id.type = SERIO_PS_PSTHRU;
         strlcpy(serio->name, "Synaptics pass-through", sizeof(serio->name));
         strlcpy(serio->phys, "synaptics-pt/serio0", sizeof(serio->name));
@@ -605,14 +603,21 @@ static struct dmi_system_id toshiba_dmi_table[] = {
                 .ident = "Toshiba Satellite",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                        DMI_MATCH(DMI_PRODUCT_NAME , "Satellite"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "Satellite"),
                 },
         },
         {
                 .ident = "Toshiba Dynabook",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
-                        DMI_MATCH(DMI_PRODUCT_NAME , "dynabook"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "dynabook"),
+                },
+        },
+        {
+                .ident = "Toshiba Portege M300",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE M300"),
                 },
         },
         { }
@@ -623,10 +628,9 @@ int synaptics_init(struct psmouse *psmouse)
 {
         struct synaptics_data *priv;
 
-        psmouse->private = priv = kmalloc(sizeof(struct synaptics_data), GFP_KERNEL);
+        psmouse->private = priv = kzalloc(sizeof(struct synaptics_data), GFP_KERNEL);
         if (!priv)
                 return -1;
-        memset(priv, 0, sizeof(struct synaptics_data));
 
         if (synaptics_query_hardware(psmouse)) {
                 printk(KERN_ERR "Unable to query Synaptics hardware.\n");