diff options
author | Rob Herring <robh@kernel.org> | 2015-10-22 17:22:09 +0300 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2015-10-22 17:22:09 +0300 |
commit | f92ce7618f0cb0ced87ea1cfe994d2e8473c61b4 (patch) | |
tree | 8589e85799e0de7b1cdf0b4e8f08397eeeb72a74 /lib/string_helpers.c | |
parent | 307751ee3212df0d047b0e1a93ce21f2e511d1a1 (diff) | |
parent | eb3fcf007fffe5830d815e713591f3e858f2a365 (diff) | |
download | linux-f92ce7618f0cb0ced87ea1cfe994d2e8473c61b4.tar.xz |
Merge branch 'dt-doc-cleanup' into for-next
Diffstat (limited to 'lib/string_helpers.c')
-rw-r--r-- | lib/string_helpers.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/string_helpers.c b/lib/string_helpers.c index 54036ce2e2dd..5939f63d90cd 100644 --- a/lib/string_helpers.c +++ b/lib/string_helpers.c @@ -59,7 +59,11 @@ void string_get_size(u64 size, u64 blk_size, const enum string_size_units units, } exp = divisor[units] / (u32)blk_size; - if (size >= exp) { + /* + * size must be strictly greater than exp here to ensure that remainder + * is greater than divisor[units] coming out of the if below. + */ + if (size > exp) { remainder = do_div(size, divisor[units]); remainder *= blk_size; i++; |