Merge ../linux-2.6

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index a620f7d9ac8e..17502d6efae7 100644
--- 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;