diff options
| author | John Crispin <john@openwrt.org> | 2013-09-17 21:46:10 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-09-17 21:46:10 +0000 |
| commit | 1878a3d6ab7e4296671eaa827623cc874d1f12c5 (patch) | |
| tree | 895fea96a0462bc19622aed65e9e179d22d61069 /target/linux/lantiq/patches-3.10/0015-MTD-lantiq-xway-fix-invalid-operator.patch | |
| parent | cd668944ef699762d4269ad71263ffe99c93ea8c (diff) | |
| download | upstream-1878a3d6ab7e4296671eaa827623cc874d1f12c5.tar.gz upstream-1878a3d6ab7e4296671eaa827623cc874d1f12c5.tar.bz2 upstream-1878a3d6ab7e4296671eaa827623cc874d1f12c5.zip | |
lantiq: add v3.10 patches
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 38031
Diffstat (limited to 'target/linux/lantiq/patches-3.10/0015-MTD-lantiq-xway-fix-invalid-operator.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.10/0015-MTD-lantiq-xway-fix-invalid-operator.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.10/0015-MTD-lantiq-xway-fix-invalid-operator.patch b/target/linux/lantiq/patches-3.10/0015-MTD-lantiq-xway-fix-invalid-operator.patch new file mode 100644 index 0000000000..1300f3e178 --- /dev/null +++ b/target/linux/lantiq/patches-3.10/0015-MTD-lantiq-xway-fix-invalid-operator.patch @@ -0,0 +1,29 @@ +From 097e8f7eb70a89f4e8ae57ceb7669e7c3ad40846 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Sun, 28 Jul 2013 18:03:54 +0200 +Subject: [PATCH 15/34] 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 + |