Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[linux-2.6-omap-h63xx.git] / drivers / i2c / busses / i2c-pmac-smu.c

diff --git a/drivers/i2c/busses/i2c-pmac-smu.c b/drivers/i2c/busses/i2c-pmac-smu.c
index 8a9f5648a23ddef2cfe80a5aea7841b6a583263f..bfefe7f7a53d1f46b5e0b754719aa0876350fd99 100644 (file)
--- a/drivers/i2c/busses/i2c-pmac-smu.c
+++ b/drivers/i2c/busses/i2c-pmac-smu.c
@@ -211,12 +211,11 @@ static int create_iface(struct device_node *np, struct device *dev)
        }
        busid = *reg;
 
-       iface = kmalloc(sizeof(struct smu_iface), GFP_KERNEL);
+       iface = kzalloc(sizeof(struct smu_iface), GFP_KERNEL);
        if (iface == NULL) {
                printk(KERN_ERR "i2c-pmac-smu: can't allocate inteface !\n");
                return -ENOMEM;
        }
-       memset(iface, 0, sizeof(struct smu_iface));
        init_completion(&iface->complete);
        iface->busid = busid;