diff options
| author |   Jeff Westfahl <jeff.westfahl@ni.com> | 2017-01-10 13:30:18 -0600 |
|---|---|---|
| committer |   Richard Weinberger <richard@nod.at> | 2018-01-17 19:28:54 +0100 |
| commit | c0e860ba034ead2a0f47052c87266e90f23cdb7b (patch) | |
| tree | bb83344c79c920b5d0d7b28f2aab78ed23ea6ad1 /drivers/mtd/ubi/build.c | |
| parent | ubifs: Fix uninitialized variable in search_dh_cookie() (diff) | |
| download | linux-dev-c0e860ba034ead2a0f47052c87266e90f23cdb7b.tar.xz linux-dev-c0e860ba034ead2a0f47052c87266e90f23cdb7b.zip | |
mtd: ubi: Use 'max_bad_blocks' to compute bad_peb_limit if available
If the user has not set max_beb_per1024 using either the cmdline or
Kconfig options for doing so, use the MTD function 'max_bad_blocks' to
compute the UBI bad_peb_limit.
Signed-off-by: Jeff Westfahl <jeff.westfahl@ni.com>
Signed-off-by: Zach Brown <zach.brown@ni.com>
Acked-by: Boris Brezillon <boris.brezillon@free-electron.com>
Acked-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'drivers/mtd/ubi/build.c')
| -rw-r--r-- | drivers/mtd/ubi/build.c | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index 136ce05d2328..e941395de3ae 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c @@ -535,8 +535,17 @@ static int get_bad_peb_limit(const struct ubi_device *ubi, int max_beb_per1024) int limit, device_pebs; uint64_t device_size; - if (!max_beb_per1024) - return 0; + if (!max_beb_per1024) { + /* + * Since max_beb_per1024 has not been set by the user in either + * the cmdline or Kconfig, use mtd_max_bad_blocks to set the + * limit if it is supported by the device. + */ + limit = mtd_max_bad_blocks(ubi->mtd, 0, ubi->mtd->size); + if (limit < 0) + return 0; + return limit; + } /* * Here we are using size of the entire flash chip and |