Home Explore Help
Sign In
RISCI_ATOM
/
libreCMC-next
forked from libreCMC/libreCMC
1
0
Fork 0
Files
Tree: aaeecaa038
Branches Tags
libreCMC-next
/
target
/
linux
/
generic
/
pending-4.14
/
441-block2mtd_probe.patch

441-block2mtd_probe.patch 1.4 KB
History Raw

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647 
  1. From: Felix Fietkau <nbd@nbd.name>
    2. 

  2. Subject: block2mtd
    3. 

  3. 

  4. Signed-off-by: Felix Fietkau <nbd@nbd.name>
    5. 

  5. ---
    6. 

  6.  drivers/mtd/devices/block2mtd.c | 9 ++++++---
    7. 

  7.  1 file changed, 6 insertions(+), 3 deletions(-)
    8. 

  8. 

  9. --- a/drivers/mtd/devices/block2mtd.c
    10. 

  10. +++ b/drivers/mtd/devices/block2mtd.c
    11. 

  11. @@ -392,7 +392,7 @@ static int block2mtd_setup2(const char *
    12. 

  12.  	/* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
    13. 

  13.  	char buf[80 + 12 + 80 + 8];
    14. 

  14.  	char *str = buf;
    15. 

  15. -	char *token[3];
    16. 

  16. +	char *token[4];
    17. 

  17.  	char *name;
    18. 

  18.  	size_t erase_size = PAGE_SIZE;
    19. 

  19.  	unsigned long timeout = MTD_DEFAULT_TIMEOUT;
    20. 

  20. @@ -406,7 +406,7 @@ static int block2mtd_setup2(const char *
    21. 

  21.  	strcpy(str, val);
    22. 

  22.  	kill_final_newline(str);
    23. 

  23.  
    24. 

  24. -	for (i = 0; i < 3; i++)
    25. 

  25. +	for (i = 0; i < 4; i++)
    26. 

  26.  		token[i] = strsep(&str, ",");
    27. 

  27.  
    28. 

  28.  	if (str) {
    29. 

  29. @@ -435,6 +435,9 @@ static int block2mtd_setup2(const char *
    30. 

  30.  	if (token[2] && (strlen(token[2]) + 1 > 80))
    31. 

  31.  		pr_err("mtd device name too long\n");
    32. 

  32.  
    33. 

  33. +	if (token[3] && kstrtoul(token[3], 0, &timeout))
    34. 

  34. +		pr_err("invalid timeout\n");
    35. 

  35. +
    36. 

  36.  	add_device(name, erase_size, token[2], timeout);
    37. 

  37.  
    38. 

  38.  	return 0;
    39. 

  39. @@ -469,7 +472,7 @@ static int block2mtd_setup(const char *v
    40. 

  40.  
    41. 

  41.  
    42. 

  42.  module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
    43. 

  43. -MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
    44. 

  44. +MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
    45. 

  45.  
    46. 

  46.  static int __init block2mtd_init(void)
    47. 

  47.  {
    48.