lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 650/717] spi: npcm-fiu: Disable clock in probe error path
    Date
    From: Lukas Wunner <lukas@wunner.de>

    commit 234266a5168bbe8220d263e3aa7aa80cf921c483 upstream.

    If the call to devm_spi_register_master() fails on probe of the NPCM FIU
    SPI driver, the clock "fiu->clk" is erroneously not unprepared and
    disabled. Fix it.

    Fixes: ace55c411b11 ("spi: npcm-fiu: add NPCM FIU controller driver")
    Signed-off-by: Lukas Wunner <lukas@wunner.de>
    Cc: <stable@vger.kernel.org> # v5.4+
    Cc: Tomer Maimon <tmaimon77@gmail.com>
    Link: https://lore.kernel.org/r/9ae62f4e1cfe542bec57ac2743e6fca9f9548f55.1607286887.git.lukas@wunner.de
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/spi/spi-npcm-fiu.c | 8 ++++++--
    1 file changed, 6 insertions(+), 2 deletions(-)

    --- a/drivers/spi/spi-npcm-fiu.c
    +++ b/drivers/spi/spi-npcm-fiu.c
    @@ -677,7 +677,7 @@ static int npcm_fiu_probe(struct platfor
    struct npcm_fiu_spi *fiu;
    void __iomem *regbase;
    struct resource *res;
    - int id;
    + int id, ret;

    ctrl = devm_spi_alloc_master(dev, sizeof(*fiu));
    if (!ctrl)
    @@ -735,7 +735,11 @@ static int npcm_fiu_probe(struct platfor
    ctrl->num_chipselect = fiu->info->max_cs;
    ctrl->dev.of_node = dev->of_node;

    - return devm_spi_register_master(dev, ctrl);
    + ret = devm_spi_register_master(dev, ctrl);
    + if (ret)
    + clk_disable_unprepare(fiu->clk);
    +
    + return ret;
    }

    static int npcm_fiu_remove(struct platform_device *pdev)

    \
     
     \ /
      Last update: 2020-12-28 15:40    [W:4.617 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site