linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / s390 / s390_rdev.c

diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c
index 3c7145d..e3f6471 100644 (file)
--- a/drivers/s390/s390_rdev.c
+++ b/drivers/s390/s390_rdev.c
@@ -27,9 +27,10 @@ s390_root_dev_register(const char *name)
 
        if (!strlen(name))
                return ERR_PTR(-EINVAL);
-       dev = kzalloc(sizeof(struct device), GFP_KERNEL);
+       dev = kmalloc(sizeof(struct device), GFP_KERNEL);
        if (!dev)
                return ERR_PTR(-ENOMEM);
+       memset(dev, 0, sizeof(struct device));
        strncpy(dev->bus_id, name, min(strlen(name), (size_t)BUS_ID_SIZE));
        dev->release = s390_root_dev_release;
        ret = device_register(dev);