summaryrefslogtreecommitdiff
path: root/drivers/parport
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 18:17:47 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 18:17:47 -0800
commit89a2fa5f2139be35e214bcf86a8291d6a1da75f2 (patch)
tree850ea412b013360bcace751db91cac6fb0067535 /drivers/parport
parent27266a18dc56611e2f2ec4e8aced0fe221e9b4b8 (diff)
parent68ee3eb8295c9c164071fcbd367c419121bd55f8 (diff)
downloadlinux-3.10-89a2fa5f2139be35e214bcf86a8291d6a1da75f2.tar.gz
linux-3.10-89a2fa5f2139be35e214bcf86a8291d6a1da75f2.tar.bz2
linux-3.10-89a2fa5f2139be35e214bcf86a8291d6a1da75f2.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'drivers/parport')
-rw-r--r--drivers/parport/parport_gsc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c
index fde29a75f88..1de52d9febf 100644
--- a/drivers/parport/parport_gsc.c
+++ b/drivers/parport/parport_gsc.c
@@ -249,7 +249,7 @@ struct parport *__devinit parport_gsc_probe_port (unsigned long base,
struct parport tmp;
struct parport *p = &tmp;
- priv = kmalloc (sizeof (struct parport_gsc_private), GFP_KERNEL);
+ priv = kzalloc (sizeof (struct parport_gsc_private), GFP_KERNEL);
if (!priv) {
printk (KERN_DEBUG "parport (0x%lx): no memory!\n", base);
return NULL;