30 lines
950 B
Diff
30 lines
950 B
Diff
|
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
|
||
|
|
|