target/linux/generic/pending-4.9/441-block2mtd_probe.patch

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Subject: block2mtd
   3
   4 Signed-off-by: Felix Fietkau <nbd@nbd.name>
   5 ---
   6  drivers/mtd/devices/block2mtd.c | 9 ++++++---
   7  1 file changed, 6 insertions(+), 3 deletions(-)
   8
   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];
  16         char *str = buf;
  17 -       char *token[3];
  18 +       char *token[4];
  19         char *name;
  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)
  23         strcpy(str, val);
  24         kill_final_newline(str);
  25
  26 -       for (i = 0; i < 3; i++)
  27 +       for (i = 0; i < 4; i++)
  28                 token[i] = strsep(&str, ",");
  29
  30         if (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");
  34
  35 +       if (token[3] && kstrtoul(token[3], 0, &timeout))
  36 +               pr_err("invalid timeout\n");
  37 +
  38         add_device(name, erase_size, token[2], timeout);
  39
  40         return 0;
  41 @@ -469,7 +472,7 @@ static int block2mtd_setup(const char *val, struct kernel_param *kp)
  42
  43
  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>]]]\"");
  47
  48  static int __init block2mtd_init(void)
  49  {
  50 --
  51 2.11.0
  52