diff mbox series

spi: rockchip: Fix a resource that is put twice in rockchip_spi_remove()

Message ID df2f4ae902474574ccdb0a8696ce51db39fbd239.1653808056.git.christophe.jaillet@wanadoo.fr
State New
Headers show
Series spi: rockchip: Fix a resource that is put twice in rockchip_spi_remove() | expand

Commit Message

Christophe JAILLET May 29, 2022, 7:07 a.m. UTC
spi_controller_put() is already called as part of
spi_unregister_controller(). The latter is called automatically because
the controller has been registered with the devm_ function.

Remove the duplicate call.

Fixes: 64e36824b32b ("spi/rockchip: add driver for Rockchip RK3xxx SoCs integrated SPI")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/spi/spi-rockchip.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Christophe JAILLET May 29, 2022, 7:17 a.m. UTC | #1
Le 29/05/2022 à 09:07, Christophe JAILLET a écrit :
> spi_controller_put() is already called as part of
> spi_unregister_controller(). The latter is called automatically because
> the controller has been registered with the devm_ function.
> 
> Remove the duplicate call.
> 
> Fixes: 64e36824b32b ("spi/rockchip: add driver for Rockchip RK3xxx SoCs integrated SPI")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
> ---
>   drivers/spi/spi-rockchip.c | 2 --
>   1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
> index a08215eb9e14..70777731b20e 100644
> --- a/drivers/spi/spi-rockchip.c
> +++ b/drivers/spi/spi-rockchip.c
> @@ -963,8 +963,6 @@ static int rockchip_spi_remove(struct platform_device *pdev)
>   	if (ctlr->dma_rx)
>   		dma_release_channel(ctlr->dma_rx);
>   
> -	spi_controller_put(ctlr);
> -
>   	return 0;
>   }
>   

NAK.

There is a spi_controller_get() call a few lines above, so this 
additional spi_controller_put() is needed.

CJ
diff mbox series

Patch

diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index a08215eb9e14..70777731b20e 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -963,8 +963,6 @@  static int rockchip_spi_remove(struct platform_device *pdev)
 	if (ctlr->dma_rx)
 		dma_release_channel(ctlr->dma_rx);
 
-	spi_controller_put(ctlr);
-
 	return 0;
 }