diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 21:17:47 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 21:17:47 -0500 |
| commit | 89a2fa5f2139be35e214bcf86a8291d6a1da75f2 (patch) | |
| tree | 850ea412b013360bcace751db91cac6fb0067535 /drivers/parport | |
| parent | 27266a18dc56611e2f2ec4e8aced0fe221e9b4b8 (diff) | |
| parent | 68ee3eb8295c9c164071fcbd367c419121bd55f8 (diff) | |
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, | |||
| 249 | struct parport tmp; | 249 | struct parport tmp; |
| 250 | struct parport *p = &tmp; | 250 | struct parport *p = &tmp; |
| 251 | 251 | ||
| 252 | priv = kmalloc (sizeof (struct parport_gsc_private), GFP_KERNEL); | 252 | priv = kzalloc (sizeof (struct parport_gsc_private), GFP_KERNEL); |
| 253 | if (!priv) { | 253 | if (!priv) { |
| 254 | printk (KERN_DEBUG "parport (0x%lx): no memory!\n", base); | 254 | printk (KERN_DEBUG "parport (0x%lx): no memory!\n", base); |
| 255 | return NULL; | 255 | return NULL; |