lkml.org 
[lkml]   [2014]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 168/182] mtd: nuc900_nand: NULL dereference in nuc900_nand_enable()
    Date
    From: Dan Carpenter <dan.carpenter@oracle.com>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    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: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/mtd/nand/nuc900_nand.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/drivers/mtd/nand/nuc900_nand.c b/drivers/mtd/nand/nuc900_nand.c
    index 52115151e4a7..2e1d16bf9818 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);

    --
    1.9.3


    \
     
     \ /
      Last update: 2014-05-13 16:21    [W:3.271 / U:0.216 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site