lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.16 0843/1039] spi: uniphier: Fix a bug that doesnt point to private data correctly
    Date
    From: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>

    commit 80bb73a9fbcde4ecc55e12f10c73fabbe68a24d1 upstream.

    In uniphier_spi_remove(), there is a wrong code to get private data from
    the platform device, so the driver can't be removed properly.

    The driver should get spi_master from the platform device and retrieve
    the private data from it.

    Cc: <stable@vger.kernel.org>
    Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC")
    Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
    Link: https://lore.kernel.org/r/1640148492-32178-1-git-send-email-hayashi.kunihiko@socionext.com
    Signed-off-by: Mark Brown <broonie@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/spi/spi-uniphier.c | 11 ++++++-----
    1 file changed, 6 insertions(+), 5 deletions(-)

    --- a/drivers/spi/spi-uniphier.c
    +++ b/drivers/spi/spi-uniphier.c
    @@ -767,12 +767,13 @@ out_master_put:

    static int uniphier_spi_remove(struct platform_device *pdev)
    {
    - struct uniphier_spi_priv *priv = platform_get_drvdata(pdev);
    + struct spi_master *master = platform_get_drvdata(pdev);
    + struct uniphier_spi_priv *priv = spi_master_get_devdata(master);

    - if (priv->master->dma_tx)
    - dma_release_channel(priv->master->dma_tx);
    - if (priv->master->dma_rx)
    - dma_release_channel(priv->master->dma_rx);
    + if (master->dma_tx)
    + dma_release_channel(master->dma_tx);
    + if (master->dma_rx)
    + dma_release_channel(master->dma_rx);

    clk_disable_unprepare(priv->clk);


    \
     
     \ /
      Last update: 2022-09-17 16:14    [W:2.644 / U:0.540 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site