diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 18:17:47 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-03 18:17:47 -0800 |
| commit | 89a2fa5f2139be35e214bcf86a8291d6a1da75f2 (patch) | |
| tree | 850ea412b013360bcace751db91cac6fb0067535 /drivers/parisc/wax.c | |
| parent | 27266a18dc56611e2f2ec4e8aced0fe221e9b4b8 (diff) | |
| parent | 68ee3eb8295c9c164071fcbd367c419121bd55f8 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
Diffstat (limited to 'drivers/parisc/wax.c')
| -rw-r--r-- | drivers/parisc/wax.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c index 17dce2adf7f..813c2c24ab1 100644 --- a/drivers/parisc/wax.c +++ b/drivers/parisc/wax.c @@ -76,7 +76,7 @@ wax_init_chip(struct parisc_device *dev) struct gsc_irq gsc_irq; int ret; - wax = kmalloc(sizeof(*wax), GFP_KERNEL); + wax = kzalloc(sizeof(*wax), GFP_KERNEL); if (!wax) return -ENOMEM; |