diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-11 19:08:08 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-10-11 19:08:08 +0000 |
| commit | b5842aed82e0c9101e99ec4bcf5959b931e98989 (patch) | |
| tree | f9749eb8ce7d61f284cc4d91bac5aafd07de8344 /target/linux/generic/patches-4.3/441-block2mtd_probe.patch | |
| parent | 3d1a65adb41db2758827fe81f36d92ab61618ea3 (diff) | |
| download | mtk-20170518-b5842aed82e0c9101e99ec4bcf5959b931e98989.zip mtk-20170518-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.gz mtk-20170518-b5842aed82e0c9101e99ec4bcf5959b931e98989.tar.bz2 | |
kernel: generic: add kernel 4.3
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47182
Diffstat (limited to 'target/linux/generic/patches-4.3/441-block2mtd_probe.patch')
| -rw-r--r-- | target/linux/generic/patches-4.3/441-block2mtd_probe.patch | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.3/441-block2mtd_probe.patch b/target/linux/generic/patches-4.3/441-block2mtd_probe.patch new file mode 100644 index 0000000..ed14537 --- /dev/null +++ b/target/linux/generic/patches-4.3/441-block2mtd_probe.patch @@ -0,0 +1,39 @@ +--- 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) + { |