summaryrefslogtreecommitdiffstats
path: root/drivers/mtd/nand
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-02-17 23:03:08 +0300
committerBrian Norris <computersforpeace@gmail.com>2014-03-10 22:42:27 -0700
commitc69dbbf3335a21aae74376d7e5db50a486d52439 (patch)
tree799731962c7b5717681a4a5e0484fe5eab4e08fe /drivers/mtd/nand
parentffdac6cdd9f4c561fc49192c1ea1570f475659e9 (diff)
downloadop-kernel-dev-c69dbbf3335a21aae74376d7e5db50a486d52439.zip
op-kernel-dev-c69dbbf3335a21aae74376d7e5db50a486d52439.tar.gz
mtd: nuc900_nand: NULL dereference in nuc900_nand_enable()
Instead of writing to "nand->reg + REG_FMICSR" we write to "REG_FMICSR" which is NULL and not a valid register. Fixes: 8bff82cbc308 ('mtd: add nand support for w90p910 (v2)') Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Diffstat (limited to 'drivers/mtd/nand')
-rw-r--r--drivers/mtd/nand/nuc900_nand.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
index 331fccb..e8a5fff 100644
--- a/drivers/mtd/nand/nuc900_nand.c
+++ b/drivers/mtd/nand/nuc900_nand.c
@@ -225,7 +225,7 @@ static void nuc900_nand_enable(struct nuc900_nand *nand)
val = __raw_readl(nand->reg + REG_FMICSR);
if (!(val & NAND_EN))
- __raw_writel(val | NAND_EN, REG_FMICSR);
+ __raw_writel(val | NAND_EN, nand->reg + REG_FMICSR);
val = __raw_readl(nand->reg + REG_SMCSR);
OpenPOWER on IntegriCloud