Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

[pandora-kernel.git] / drivers / s390 / s390_rdev.c

diff --git a/drivers/s390/s390_rdev.c b/drivers/s390/s390_rdev.c
index 566cc3d..3c7145d 100644 (file)
--- a/drivers/s390/s390_rdev.c
+++ b/drivers/s390/s390_rdev.c
@@ -1,11 +1,10 @@
 /*
  *  drivers/s390/s390_rdev.c
  *  s390 root device
- *   $Revision: 1.2 $
  *
  *    Copyright (C) 2002, 2005 IBM Deutschland Entwicklung GmbH,
  *                      IBM Corporation
- *    Author(s): Cornelia Huck (cohuck@de.ibm.com)
+ *    Author(s): Cornelia Huck (cornelia.huck@de.ibm.com)
  *               Carsten Otte  (cotte@de.ibm.com)
  */
 
@@ -28,10 +27,9 @@ s390_root_dev_register(const char *name)
 
        if (!strlen(name))
                return ERR_PTR(-EINVAL);
-       dev = kmalloc(sizeof(struct device), GFP_KERNEL);
+       dev = kzalloc(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);