diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 03:17:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 03:17:47 +0100 |
| commit | 89a2fa5f2139be35e214bcf86a8291d6a1da75f2 (patch) | |
| tree | 850ea412b013360bcace751db91cac6fb0067535 /drivers/parport | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| parent | [PARISC] New syscalls (inotify, *at, pselect6/ppoll, migrate_pages) (diff) | |
| download | linux-89a2fa5f2139be35e214bcf86a8291d6a1da75f2.tar.xz linux-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.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/parport_gsc.c b/drivers/parport/parport_gsc.c index fde29a75f888..1de52d9febf9 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; |