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 652/717] spi: rb4xx: Dont leak SPI master in probe error path
    Date
    From: Lukas Wunner <lukas@wunner.de>

    commit a4729c3506c3eb1a6ca5c0289f4e7cafa4115065 upstream.

    If the calls to devm_clk_get(), devm_spi_register_master() or
    clk_prepare_enable() fail on probe of the Mikrotik RB4xx SPI driver,
    the spi_master struct is erroneously not freed.

    Fix by switching over to the new devm_spi_alloc_master() helper.

    Fixes: 05aec357871f ("spi: Add SPI driver for Mikrotik RB4xx series boards")
    Signed-off-by: Lukas Wunner <lukas@wunner.de>
    Cc: <stable@vger.kernel.org> # v4.2+: 5e844cc37a5c: spi: Introduce device-managed SPI controller allocation
    Cc: <stable@vger.kernel.org> # v4.2+
    Cc: Bert Vermeulen <bert@biot.com>
    Link: https://lore.kernel.org/r/369bf26d71927f60943b1d9d8f51810f00b0237d.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-rb4xx.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/spi/spi-rb4xx.c
    +++ b/drivers/spi/spi-rb4xx.c
    @@ -143,7 +143,7 @@ static int rb4xx_spi_probe(struct platfo
    if (IS_ERR(spi_base))
    return PTR_ERR(spi_base);

    - master = spi_alloc_master(&pdev->dev, sizeof(*rbspi));
    + master = devm_spi_alloc_master(&pdev->dev, sizeof(*rbspi));
    if (!master)
    return -ENOMEM;


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