Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-drm-fsl-dcu.git] / lib / kobject.c

diff --git a/lib/kobject.c b/lib/kobject.c
index 744a4b102c7fa595b09808f8a6f949318a1f57a1..7ce6dc138e90ed391618b222847a664024daf402 100644 (file)
--- a/lib/kobject.c
+++ b/lib/kobject.c
@@ -111,10 +111,9 @@ char *kobject_get_path(struct kobject *kobj, gfp_t gfp_mask)
        len = get_kobj_path_length(kobj);
        if (len == 0)
                return NULL;
-       path = kmalloc(len, gfp_mask);
+       path = kzalloc(len, gfp_mask);
        if (!path)
                return NULL;
-       memset(path, 0x00, len);
        fill_kobj_path(kobj, path, len);
 
        return path;