aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/parport
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/parport_cs.c3
-rw-r--r--drivers/parport/parport_serial.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/drivers/parport/parport_cs.c b/drivers/parport/parport_cs.c
index 8b7d84eca05d..802a81d47367 100644
--- a/drivers/parport/parport_cs.c
+++ b/drivers/parport/parport_cs.c
@@ -105,9 +105,8 @@ static int parport_probe(struct pcmcia_device *link)
105 DEBUG(0, "parport_attach()\n"); 105 DEBUG(0, "parport_attach()\n");
106 106
107 /* Create new parport device */ 107 /* Create new parport device */
108 info = kmalloc(sizeof(*info), GFP_KERNEL); 108 info = kzalloc(sizeof(*info), GFP_KERNEL);
109 if (!info) return -ENOMEM; 109 if (!info) return -ENOMEM;
110 memset(info, 0, sizeof(*info));
111 link->priv = info; 110 link->priv = info;
112 info->p_dev = link; 111 info->p_dev = link;
113 112
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 90ea3b8b99b0..bd6ad8b38168 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -324,10 +324,9 @@ static int __devinit parport_serial_pci_probe (struct pci_dev *dev,
324 struct parport_serial_private *priv; 324 struct parport_serial_private *priv;
325 int err; 325 int err;
326 326
327 priv = kmalloc (sizeof *priv, GFP_KERNEL); 327 priv = kzalloc (sizeof *priv, GFP_KERNEL);
328 if (!priv) 328 if (!priv)
329 return -ENOMEM; 329 return -ENOMEM;
330 memset(priv, 0, sizeof(struct parport_serial_private));
331 pci_set_drvdata (dev, priv); 330 pci_set_drvdata (dev, priv);
332 331
333 err = pci_enable_device (dev); 332 err = pci_enable_device (dev);