summaryrefslogtreecommitdiffstats
path: root/drivers/parisc/wax.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2006-02-07 07:47:12 +0100
committerJeff Garzik <jgarzik@pobox.com>2006-02-07 07:47:12 +0100
commit3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb (patch)
tree7f8d84353852401ec74e005f6f0b1eb958b9a70d /drivers/parisc/wax.c
parent[netdrvr] schedule eepro100 for removal (diff)
parentMerge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/... (diff)
downloadlinux-3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb.tar.xz
linux-3c9b3a8575b4f2551e3b5b74ffa1c3559c6338eb.zip
Merge branch 'master'
Diffstat (limited to 'drivers/parisc/wax.c')
-rw-r--r--drivers/parisc/wax.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index 17dce2adf7fe..813c2c24ab1e 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;