1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/mtd/ubi/misc.c b/drivers/mtd/ubi/misc.c
index 8bbfb444b895..d089df055484 100644
--- a/drivers/mtd/ubi/misc.c
+++ b/drivers/mtd/ubi/misc.c
@@ -121,10 +121,18 @@ void ubi_update_reserved(struct ubi_device *ubi)
  */
 void ubi_calculate_reserved(struct ubi_device *ubi)
 {
-        ubi->beb_rsvd_level = ubi->good_peb_count/100;
-        ubi->beb_rsvd_level *= CONFIG_MTD_UBI_BEB_RESERVE;
-        if (ubi->beb_rsvd_level < MIN_RESEVED_PEBS)
-                ubi->beb_rsvd_level = MIN_RESEVED_PEBS;
+        /*
+         * Calculate the actual number of PEBs currently needed to be reserved
+         * for future bad eraseblock handling.
+         */
+        ubi->beb_rsvd_level = ubi->bad_peb_limit - ubi->bad_peb_count;
+        if (ubi->beb_rsvd_level < 0) {
+                ubi->beb_rsvd_level = 0;
+                ubi_warn("number of bad PEBs (%d) is above the expected limit "
+                         "(%d), not reserving any PEBs for bad PEB handling, "
+                         "will use available PEBs (if any)",
+                         ubi->bad_peb_count, ubi->bad_peb_limit);
+        }
 }
 
 /**