This is a note to let you know that I've just added the patch titled spi: uniphier: Fix a bug that doesn't point to private data correctly to the 5.15-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: spi-uniphier-fix-a-bug-that-doesn-t-point-to-private-data-correctly.patch and it can be found in the queue-5.15 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 80bb73a9fbcde4ecc55e12f10c73fabbe68a24d1 Mon Sep 17 00:00:00 2001 From: Kunihiko Hayashi <hayashi.kunihiko@xxxxxxxxxxxxx> Date: Wed, 22 Dec 2021 13:48:12 +0900 Subject: spi: uniphier: Fix a bug that doesn't point to private data correctly From: Kunihiko Hayashi <hayashi.kunihiko@xxxxxxxxxxxxx> 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@xxxxxxxxxxxxxxx> Fixes: 5ba155a4d4cc ("spi: add SPI controller driver for UniPhier SoC") Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@xxxxxxxxxxxxx> Link: https://lore.kernel.org/r/1640148492-32178-1-git-send-email-hayashi.kunihiko@xxxxxxxxxxxxx Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- 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); Patches currently in stable-queue which might be from hayashi.kunihiko@xxxxxxxxxxxxx are queue-5.15/spi-uniphier-fix-a-bug-that-doesn-t-point-to-private-data-correctly.patch queue-5.15/phy-uniphier-usb3ss-fix-unintended-writing-zeros-to-.patch