Merge branch 'for-linus' of git://git.infradead.org/~dedekind/ubi-2.6

[karo-tx-linux.git] / drivers / parisc / wax.c

diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index 17dce2adf7fe9656ea328e6b0dd79df5e749e466..813c2c24ab1ef8a1273becb3dbfd2ecabcadaebf 100644 (file)
--- 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;