aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2007-12-26 07:25:58 -0500
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2007-12-26 12:15:18 -0500
commitaeddb87718823fb81b896155b34d1bb4c8cae874 (patch)
treeb96e3d90dbbbcebb77476a73dcfb958ab0b4d374
parentb6b76ba466bbd47397efad0fdaeaa5ebf7d462c7 (diff)
UBI: do not support kiB
Be strict and accept only KiB, MiB and GiB, not Kib, not kib, etc. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
-rw-r--r--drivers/mtd/ubi/build.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 5098e6d57092..b967191cc97e 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -1038,10 +1038,8 @@ static int __init bytes_str_to_int(const char *str)
1038 case 'M': 1038 case 'M':
1039 result *= 1024; 1039 result *= 1024;
1040 case 'K': 1040 case 'K':
1041 case 'k':
1042 result *= 1024; 1041 result *= 1024;
1043 if (endp[1] == 'i' && (endp[2] == '\0' || 1042 if (endp[1] == 'i' && endp[2] == 'B')
1044 endp[2] == 'B' || endp[2] == 'b'))
1045 endp += 2; 1043 endp += 2;
1046 case '\0': 1044 case '\0':
1047 break; 1045 break;