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 659/717] spi: mt7621: Disable clock in probe error path
    Date
    From: Lukas Wunner <lukas@wunner.de>

    commit 24f7033405abe195224ec793dbc3d7a27dec0b98 upstream.

    Commit 702b15cb9712 ("spi: mt7621: fix missing clk_disable_unprepare()
    on error in mt7621_spi_probe") sought to disable the SYS clock on probe
    errors, but only did so for 2 of 3 potentially failing calls: The clock
    needs to be disabled on failure of devm_spi_register_controller() as
    well.

    Moreover, the commit purports to fix a bug in commit cbd66c626e16 ("spi:
    mt7621: Move SPI driver out of staging") but in reality the bug has
    existed since the driver was first introduced.

    Fixes: 1ab7f2a43558 ("staging: mt7621-spi: add mt7621 support")
    Signed-off-by: Lukas Wunner <lukas@wunner.de>
    Cc: <stable@vger.kernel.org> # v4.17+: 702b15cb9712: spi: mt7621: fix missing clk_disable_unprepare() on error in mt7621_spi_probe
    Cc: <stable@vger.kernel.org> # v4.17+
    Cc: Qinglang Miao <miaoqinglang@huawei.com>
    Link: https://lore.kernel.org/r/36ad42760087952fb7c10aae7d2628547c26a7ec.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-mt7621.c | 6 +++++-
    1 file changed, 5 insertions(+), 1 deletion(-)

    --- a/drivers/spi/spi-mt7621.c
    +++ b/drivers/spi/spi-mt7621.c
    @@ -382,7 +382,11 @@ static int mt7621_spi_probe(struct platf
    return ret;
    }

    - return devm_spi_register_controller(&pdev->dev, master);
    + ret = devm_spi_register_controller(&pdev->dev, master);
    + if (ret)
    + clk_disable_unprepare(clk);
    +
    + return ret;
    }

    static int mt7621_spi_remove(struct platform_device *pdev)

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