summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2014-02-17 23:03:08 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-05-13 13:32:54 +0200
commit9ef4bb8b24c83617043c6804fb547dbe1c4d9052 (patch)
tree3432dea8a55c3aca7bd7bf2ffdb0028076a42f7d
parent81cb54ac10383b6d8c19674c9498a4f0e880250d (diff)
downloadlwn-9ef4bb8b24c83617043c6804fb547dbe1c4d9052.tar.gz
lwn-9ef4bb8b24c83617043c6804fb547dbe1c4d9052.zip
mtd: nuc900_nand: NULL dereference in nuc900_nand_enable()
commit c69dbbf3335a21aae74376d7e5db50a486d52439 upstream. 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-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 9ee09a8177c6..7360f7872d9a 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);