diff options
| author | John Crispin <john@openwrt.org> | 2014-08-18 13:09:30 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2014-08-18 13:09:30 +0000 |
| commit | 12b73579e4da2c4ceaf00462ce16ddb0eb6ffaf4 (patch) | |
| tree | a03125bc8c0a4d9ae0d45e525e8a51d48bf58fa3 /target/linux/lantiq/patches-3.14/0013-MTD-lantiq-xway-fix-invalid-operator.patch | |
| parent | 860e01d7c443985dc583cbf2da189790054b9e0e (diff) | |
| download | upstream-12b73579e4da2c4ceaf00462ce16ddb0eb6ffaf4.tar.gz upstream-12b73579e4da2c4ceaf00462ce16ddb0eb6ffaf4.tar.bz2 upstream-12b73579e4da2c4ceaf00462ce16ddb0eb6ffaf4.zip | |
lantiq: update to 3.14
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 42188
Diffstat (limited to 'target/linux/lantiq/patches-3.14/0013-MTD-lantiq-xway-fix-invalid-operator.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.14/0013-MTD-lantiq-xway-fix-invalid-operator.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.14/0013-MTD-lantiq-xway-fix-invalid-operator.patch b/target/linux/lantiq/patches-3.14/0013-MTD-lantiq-xway-fix-invalid-operator.patch new file mode 100644 index 0000000000..5aad493a50 --- /dev/null +++ b/target/linux/lantiq/patches-3.14/0013-MTD-lantiq-xway-fix-invalid-operator.patch @@ -0,0 +1,29 @@ +From c243da18ea2a02e8cfb3f821232783376131948a Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Sun, 28 Jul 2013 18:03:54 +0200 +Subject: [PATCH 13/31] MTD: lantiq: xway: fix invalid operator + +xway_read_byte should use a logic or and not an add operator when working out +the nand address. + +Signed-off-by: John Crispin <blogic@openwrt.org> +--- + drivers/mtd/nand/xway_nand.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/mtd/nand/xway_nand.c b/drivers/mtd/nand/xway_nand.c +index 3f81dc8..169a91d 100644 +--- a/drivers/mtd/nand/xway_nand.c ++++ b/drivers/mtd/nand/xway_nand.c +@@ -124,7 +124,7 @@ static unsigned char xway_read_byte(struct mtd_info *mtd) + int ret; + + spin_lock_irqsave(&ebu_lock, flags); +- ret = ltq_r8((void __iomem *)(nandaddr + NAND_READ_DATA)); ++ ret = ltq_r8((void __iomem *)(nandaddr | NAND_READ_DATA)); + spin_unlock_irqrestore(&ebu_lock, flags); + + return ret; +-- +1.7.10.4 + |