Merge branch 'master'

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index 373e7b728fa7..6b2eb6f39b4d 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -152,12 +152,13 @@ attribute_container_add_device(struct device *dev,
 
                 if (!cont->match(cont, dev))
                         continue;
-                ic = kmalloc(sizeof(struct internal_container), GFP_KERNEL);
+
+                ic = kzalloc(sizeof(*ic), GFP_KERNEL);
                 if (!ic) {
                         dev_printk(KERN_ERR, dev, "failed to allocate class container\n");
                         continue;
                 }
-                memset(ic, 0, sizeof(struct internal_container));
+
                 ic->cont = cont;
                 class_device_initialize(&ic->classdev);
                 ic->classdev.dev = get_device(dev);