Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / parisc / wax.c

diff --git a/drivers/parisc/wax.c b/drivers/parisc/wax.c
index e547d7d..813c2c2 100644 (file)
--- a/drivers/parisc/wax.c
+++ b/drivers/parisc/wax.c
@@ -76,12 +76,12 @@ 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;
 
        wax->name = "wax";
-       wax->hpa = dev->hpa;
+       wax->hpa = dev->hpa.start;
 
        wax->version = 0;   /* gsc_readb(wax->hpa+WAX_VER); */
        printk(KERN_INFO "%s at 0x%lx found.\n", wax->name, wax->hpa);