projects
/
openwrt
/
staging
/
wigyori.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 4.9 to 4.9.44
[openwrt/staging/wigyori.git]
/
target
/
linux
/
generic
/
pending-4.9
/
441-block2mtd_probe.patch
diff --git
a/target/linux/generic/pending-4.9/441-block2mtd_probe.patch
b/target/linux/generic/pending-4.9/441-block2mtd_probe.patch
index 11ff292aa795f6cc14e57d7dd5f0630aa6468cc0..fee970ab61aa1bc1a820ff3bdaf46a80d21b5ff2 100644
(file)
--- a/
target/linux/generic/pending-4.9/441-block2mtd_probe.patch
+++ b/
target/linux/generic/pending-4.9/441-block2mtd_probe.patch
@@
-6,11
+6,9
@@
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/mtd/devices/block2mtd.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
drivers/mtd/devices/block2mtd.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
-diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c
-index 22135cc48879..9865041c347b 100644
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
--- a/drivers/mtd/devices/block2mtd.c
+++ b/drivers/mtd/devices/block2mtd.c
-@@ -392,7 +392,7 @@ static int block2mtd_setup2(const char *
val)
+@@ -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;
/* 80 for device, 12 for erase size, 80 for name, 8 for timeout */
char buf[80 + 12 + 80 + 8];
char *str = buf;
@@
-19,7
+17,7
@@
index 22135cc48879..9865041c347b 100644
char *name;
size_t erase_size = PAGE_SIZE;
unsigned long timeout = MTD_DEFAULT_TIMEOUT;
char *name;
size_t erase_size = PAGE_SIZE;
unsigned long timeout = MTD_DEFAULT_TIMEOUT;
-@@ -406,7 +406,7 @@ static int block2mtd_setup2(const char *
val)
+@@ -406,7 +406,7 @@ static int block2mtd_setup2(const char *
strcpy(str, val);
kill_final_newline(str);
strcpy(str, val);
kill_final_newline(str);
@@
-28,7
+26,7
@@
index 22135cc48879..9865041c347b 100644
token[i] = strsep(&str, ",");
if (str) {
token[i] = strsep(&str, ",");
if (str) {
-@@ -435,6 +435,9 @@ static int block2mtd_setup2(const char *
val)
+@@ -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[2] && (strlen(token[2]) + 1 > 80))
pr_err("mtd device name too long\n");
@@
-38,7
+36,7
@@
index 22135cc48879..9865041c347b 100644
add_device(name, erase_size, token[2], timeout);
return 0;
add_device(name, erase_size, token[2], timeout);
return 0;
-@@ -469,7 +472,7 @@ static int block2mtd_setup(const char *v
al, struct kernel_param *kp)
+@@ -469,7 +472,7 @@ static int block2mtd_setup(const char *v
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
module_param_call(block2mtd, block2mtd_setup, NULL, NULL, 0200);
@@
-47,6
+45,3
@@
index 22135cc48879..9865041c347b 100644
static int __init block2mtd_init(void)
{
static int __init block2mtd_init(void)
{
---
-2.11.0
-