projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: bump 4.4 to 4.4.167
[openwrt/staging/chunkeey.git]
/
target
/
linux
/
layerscape
/
patches-4.4
/
1093-mtd-spi-nor-check-return-value-from-read-write.patch
diff --git
a/target/linux/layerscape/patches-4.4/1093-mtd-spi-nor-check-return-value-from-read-write.patch
b/target/linux/layerscape/patches-4.4/1093-mtd-spi-nor-check-return-value-from-read-write.patch
index 85a231515f7f726218d686358e1d28addc5550a2..07081fbe7e61602f63c67554792c8d2c281ab02e 100644
(file)
--- a/
target/linux/layerscape/patches-4.4/1093-mtd-spi-nor-check-return-value-from-read-write.patch
+++ b/
target/linux/layerscape/patches-4.4/1093-mtd-spi-nor-check-return-value-from-read-write.patch
@@
-14,7
+14,7
@@
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -9
24,7 +924
,10 @@ static int spi_nor_read(struct mtd_info
+@@ -9
30,7 +930
,10 @@ static int spi_nor_read(struct mtd_info
ret = nor->read(nor, from, len, retlen, buf);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
ret = nor->read(nor, from, len, retlen, buf);
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_READ);
@@
-26,7
+26,7
@@
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
}
static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
}
static int sst_write(struct mtd_info *mtd, loff_t to, size_t len,
-@@ -95
0,10 +953
,14 @@ static int sst_write(struct mtd_info *mt
+@@ -95
6,10 +959
,14 @@ static int sst_write(struct mtd_info *mt
nor->program_opcode = SPINOR_OP_BP;
/* write one byte. */
nor->program_opcode = SPINOR_OP_BP;
/* write one byte. */
@@
-43,7
+43,7
@@
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
}
to += actual;
}
to += actual;
-@@ -96
2,10 +969
,14 @@ static int sst_write(struct mtd_info *mt
+@@ -96
8,10 +975
,14 @@ static int sst_write(struct mtd_info *mt
nor->program_opcode = SPINOR_OP_AAI_WP;
/* write two bytes. */
nor->program_opcode = SPINOR_OP_AAI_WP;
/* write two bytes. */
@@
-60,7
+60,7
@@
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
to += 2;
nor->sst_write_second = true;
}
to += 2;
nor->sst_write_second = true;
}
-@@ -9
74,21 +985
,24 @@ static int sst_write(struct mtd_info *mt
+@@ -9
80,21 +991
,24 @@ static int sst_write(struct mtd_info *mt
write_disable(nor);
ret = spi_nor_wait_till_ready(nor);
if (ret)
write_disable(nor);
ret = spi_nor_wait_till_ready(nor);
if (ret)
@@
-90,7
+90,7
@@
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
}
spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
return ret;
}
-@@ -10
17,14 +1031
,18 @@ static int spi_nor_write(struct mtd_info
+@@ -10
23,14 +1037
,18 @@ static int spi_nor_write(struct mtd_info
/* do all the bytes fit onto one page? */
if (page_offset + len <= nor->page_size) {
/* do all the bytes fit onto one page? */
if (page_offset + len <= nor->page_size) {
@@
-112,7
+112,7
@@
Signed-off-by: Hou Zhiqiang <Zhiqiang.Hou@freescale.com>
page_size = len - i;
if (page_size > nor->page_size)
page_size = nor->page_size;
page_size = len - i;
if (page_size > nor->page_size)
page_size = nor->page_size;
-@@ -10
35,7 +1053
,11 @@ static int spi_nor_write(struct mtd_info
+@@ -10
41,7 +1059
,11 @@ static int spi_nor_write(struct mtd_info
write_enable(nor);
write_enable(nor);