Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

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

diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index f065583ddcf104dea3b14ef5e3015234c985c72f..65b939a059e9b6fd803cacc7699533b3fd58b559 100644 (file)
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -19,6 +19,8 @@
 #include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/platform_device.h>
+
 #include <asm/io.h>
 #include <linux/fsl_devices.h>
 #include <linux/i2c.h>
@@ -296,10 +298,9 @@ static int fsl_i2c_probe(struct device *device)
 
        pdata = (struct fsl_i2c_platform_data *) pdev->dev.platform_data;
 
-       if (!(i2c = kmalloc(sizeof(*i2c), GFP_KERNEL))) {
+       if (!(i2c = kzalloc(sizeof(*i2c), GFP_KERNEL))) {
                return -ENOMEM;
        }
-       memset(i2c, 0, sizeof(*i2c));
 
        i2c->irq = platform_get_irq(pdev, 0);
        i2c->flags = pdata->device_flags;
@@ -361,6 +362,7 @@ static int fsl_i2c_remove(struct device *device)
 
 /* Structure for a device driver */
 static struct device_driver fsl_i2c_driver = {
+       .owner = THIS_MODULE,
        .name = "fsl-i2c",
        .bus = &platform_bus_type,
        .probe = fsl_i2c_probe,