1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index 784c6e1a0391..fd5fe12d7461 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -221,7 +221,14 @@ static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev,
                 info->mtd = info->subdev[0].mtd;
                 ret = 0;
         } else if (info->num_subdev > 1) {
-                struct mtd_info *cdev[nr];
+                struct mtd_info **cdev;
+
+                cdev = kmalloc_array(nr, sizeof(*cdev), GFP_KERNEL);
+                if (!cdev) {
+                        ret = -ENOMEM;
+                        goto err;
+                }
+
                 /*
                  * We detected multiple devices.  Concatenate them together.
                  */
@@ -230,6 +237,7 @@ static struct sa_info *sa1100_setup_mtd(struct platform_device *pdev,
 
                 info->mtd = mtd_concat_create(cdev, info->num_subdev,
                                               plat->name);
+                kfree(cdev);
                 if (info->mtd == NULL) {
                         ret = -ENXIO;
                         goto err;