Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6] / drivers / dio / dio.c

diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index a620f7d9ac8e730c4258a1f8e2c5c0d334e488f6..17502d6efae788c2bb614f3833a550de9059a59c 100644 (file)
--- a/drivers/dio/dio.c
+++ b/drivers/dio/dio.c
@@ -224,11 +224,10 @@ static int __init dio_init(void)
                set_fs(fs);
 
                 /* Found a board, allocate it an entry in the list */
-               dev = kmalloc(sizeof(struct dio_dev), GFP_KERNEL);
+               dev = kzalloc(sizeof(struct dio_dev), GFP_KERNEL);
                if (!dev)
                        return 0;
 
-               memset(dev, 0, sizeof(struct dio_dev));
                dev->bus = &dio_bus;
                dev->dev.parent = &dio_bus.dev;
                dev->dev.bus = &dio_bus_type;