mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
74d00a8c38
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
--- a/drivers/mtd/devices/block2mtd.c
|
|
+++ b/drivers/mtd/devices/block2mtd.c
|
|
@@ -392,7 +392,7 @@ static int block2mtd_setup2(const char *
|
|
/* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
|
|
char buf[80 + 12 + 80 + 8];
|
|
char *str = buf;
|
|
- char *token[3];
|
|
+ char *token[4];
|
|
char *name;
|
|
size_t erase_size = PAGE_SIZE;
|
|
unsigned long timeout = MTD_DEFAULT_TIMEOUT;
|
|
@@ -406,7 +406,7 @@ static int block2mtd_setup2(const char *
|
|
strcpy(str, val);
|
|
kill_final_newline(str);
|
|
|
|
- for (i = 0; i < 3; i++)
|
|
+ for (i = 0; i < 4; i++)
|
|
token[i] = strsep(&str, ",");
|
|
|
|
if (str) {
|
|
@@ -435,6 +435,9 @@ static int block2mtd_setup2(const char *
|
|
if (token[2] && (strlen(token[2]) + 1 > 80))
|
|
pr_err("mtd device name too long\n");
|
|
|
|
+ if (token[3] && kstrtoul(token[3], 0, &timeout))
|
|
+ pr_err("invalid timeout\n");
|
|
+
|
|
add_device(name, erase_size, token[2], timeout);
|
|
|
|
return 0;
|
|
@@ -469,7 +472,7 @@ static int block2mtd_setup(const char *v
|
|
|
|
|
|
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
|
|
-MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>]]\"");
|
|
+MODULE_PARM_DESC(block2mtd, "Device to use. \"block2mtd=<dev>[,<erasesize>[,<name>[,<timeout>]]]\"");
|
|
|
|
static int __init block2mtd_init(void)
|
|
{
|