aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-4.3/441-block2mtd_probe.patch
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2016-03-07 17:56:58 +0000
committerFelix Fietkau <nbd@openwrt.org>2016-03-07 17:56:58 +0000
commit46c7d0d1ab610701b91ac9ba465e63f51e80ee06 (patch)
treeac61f4ccb56d99a7cf65fc19840cc4c906ce65f3 /target/linux/generic/patches-4.3/441-block2mtd_probe.patch
parent3abf5ce6564e24a388b86caf1a00f91f4262b312 (diff)
downloadupstream-46c7d0d1ab610701b91ac9ba465e63f51e80ee06.tar.gz
upstream-46c7d0d1ab610701b91ac9ba465e63f51e80ee06.tar.bz2
upstream-46c7d0d1ab610701b91ac9ba465e63f51e80ee06.zip
kernel: remove linux 4.3 support
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 48955
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.patch39
1 files changed, 0 insertions, 39 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
deleted file mode 100644
index ed14537a6c..0000000000
--- a/target/linux/generic/patches-4.3/441-block2mtd_probe.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- 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)
- {