2 files changed, 3 insertions, 2 deletions

diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index 3e185e46cf6c..271a842f8c39 100644
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -51,7 +51,8 @@ config MTD_UBI_BEB_LIMIT
           MTD partitions of the same size, UBI will reserve 40 eraseblocks when
           attaching a partition.
 
-          This option can be overridden by the "mtd=" UBI module parameter.
+          This option can be overridden by the "mtd=" UBI module parameter or
+          by the "attach" ioctl.
 
           Leave the default value if unsure.
 
diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c
index 619f9144f990..7885dc0934ce 100644
--- a/drivers/mtd/ubi/cdev.c
+++ b/drivers/mtd/ubi/cdev.c
@@ -1011,7 +1011,7 @@ static long ctrl_cdev_ioctl(struct file *file, unsigned int cmd,
                  */
                 mutex_lock(&ubi_devices_mutex);
                 err = ubi_attach_mtd_dev(mtd, req.ubi_num, req.vid_hdr_offset,
-                                         CONFIG_MTD_UBI_BEB_LIMIT);
+                                         req.max_beb_per1024);
                 mutex_unlock(&ubi_devices_mutex);
                 if (err < 0)
                         put_mtd_device(mtd);