lkml.org 
[lkml]   [2020]   [Oct]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 238/408] mtd: rawnand: vf610: disable clk on error handling path in probe
    Date
    From: Evgeny Novikov <novikov@ispras.ru>

    [ Upstream commit cb7dc3178a9862614b1e7567d77f4679f027a074 ]

    vf610_nfc_probe() does not invoke clk_disable_unprepare() on one error
    handling path. The patch fixes that.

    Found by Linux Driver Verification project (linuxtesting.org).

    Fixes: 6f0ce4dfc5a3 ("mtd: rawnand: vf610: Avoid a potential NULL pointer dereference")
    Signed-off-by: Evgeny Novikov <novikov@ispras.ru>
    Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
    Link: https://lore.kernel.org/linux-mtd/20200806072634.23528-1-novikov@ispras.ru
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/mtd/nand/raw/vf610_nfc.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/mtd/nand/raw/vf610_nfc.c b/drivers/mtd/nand/raw/vf610_nfc.c
    index 6b399a75f9aec..b6f114da57143 100644
    --- a/drivers/mtd/nand/raw/vf610_nfc.c
    +++ b/drivers/mtd/nand/raw/vf610_nfc.c
    @@ -850,8 +850,10 @@ static int vf610_nfc_probe(struct platform_device *pdev)
    }

    of_id = of_match_device(vf610_nfc_dt_ids, &pdev->dev);
    - if (!of_id)
    - return -ENODEV;
    + if (!of_id) {
    + err = -ENODEV;
    + goto err_disable_clk;
    + }

    nfc->variant = (enum vf610_nfc_variant)of_id->data;

    --
    2.25.1


    \
     
     \ /
      Last update: 2020-10-27 15:39    [W:2.746 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site