1 From: Felix Fietkau <nbd@nbd.name>
4 Signed-off-by: Felix Fietkau <nbd@nbd.name>
6 drivers/mtd/devices/block2mtd.c | 9 ++++++---
7 1 file changed, 6 insertions(+), 3 deletions(-)
9 diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
10 index 22135cc48879..9865041c347b 100644
11 --- a/drivers/mtd/devices/block2mtd.c
12 +++ b/drivers/mtd/devices/block2mtd.c
13 @@ -392,7 +392,7 @@ static int block2mtd_setup2(const char *val)
14 /* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
15 char buf[80 + 12 + 80 + 8];
20 size_t erase_size = PAGE_SIZE;
21 unsigned long timeout = MTD_DEFAULT_TIMEOUT;
22 @@ -406,7 +406,7 @@ static int block2mtd_setup2(const char *val)
24 kill_final_newline(str);
26 - for (i = 0; i < 3; i++)
27 + for (i = 0; i < 4; i++)
28 token[i] = strsep(&str, ",");
31 @@ -435,6 +435,9 @@ static int block2mtd_setup2(const char *val)
32 if (token[2] && (strlen(token[2]) + 1 > 80))
33 pr_err("mtd device name too long\n");
35 + if (token[3] && kstrtoul(token[3], 0, &timeout))
36 + pr_err("invalid timeout\n");
38 add_device(name, erase_size, token[2], timeout);
41 @@ -469,7 +472,7 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)
44 module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
45 -MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
46 +MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
48 static int __init block2mtd_init(void)