| From 4019a55010ad188f93895fafc70dcfc78d19c6dd Mon Sep 17 00:00:00 2001 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Sat, 9 Jun 2012 19:08:25 +0300 |
| Subject: [PATCH] mtd: cafe_nand: fix an & vs | mistake |
| |
| commit 48f8b641297df49021093763a3271119a84990a2 upstream. |
| |
| The intent here was clearly to set result to true if the 0x40000000 flag |
| was set. But instead there was a | vs & typo and we always set result |
| to true. |
| |
| Artem: check the spec at |
| wiki.laptop.org/images/5/5c/88ALP01_Datasheet_July_2007.pdf |
| and this fix looks correct. |
| |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> |
| Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| drivers/mtd/nand/cafe_nand.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/mtd/nand/cafe_nand.c b/drivers/mtd/nand/cafe_nand.c |
| index e5a9f9ccea60..882d01910804 100644 |
| --- a/drivers/mtd/nand/cafe_nand.c |
| +++ b/drivers/mtd/nand/cafe_nand.c |
| @@ -104,7 +104,7 @@ static const char *part_probes[] = { "cmdlinepart", "RedBoot", NULL }; |
| static int cafe_device_ready(struct mtd_info *mtd) |
| { |
| struct cafe_priv *cafe = mtd->priv; |
| - int result = !!(cafe_readl(cafe, NAND_STATUS) | 0x40000000); |
| + int result = !!(cafe_readl(cafe, NAND_STATUS) & 0x40000000); |
| uint32_t irqs = cafe_readl(cafe, NAND_IRQ); |
| |
| cafe_writel(cafe, irqs, NAND_IRQ); |
| -- |
| 1.8.5.2 |
| |
