Merge branch 'linus' into perf/urgent

[cascardo/linux.git] / drivers / memstick / core / mspro_block.c

diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c
index f4176ca..fc145d2 100644 (file)
--- a/drivers/memstick/core/mspro_block.c
+++ b/drivers/memstick/core/mspro_block.c
@@ -1023,8 +1023,8 @@ static int mspro_block_read_attributes(struct memstick_dev *card)
        } else
                attr_count = attr->count;
 
-       msb->attr_group.attrs = kzalloc((attr_count + 1)
-                                       * sizeof(struct attribute),
+       msb->attr_group.attrs = kcalloc(attr_count + 1,
+                                       sizeof(*msb->attr_group.attrs),
                                        GFP_KERNEL);
        if (!msb->attr_group.attrs) {
                rc = -ENOMEM;