Commit 5127e149 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fix from Mark Brown:
 "A fix for the remove path of the Rockchip driver, the code was just
  clearly and obviously wrong"

* tag 'spi-fix-v6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: rockchip-sfc: Fix error in remove progress
parents b648264c 7f9a1eed

drivers/spi/spi-rockchip-sfc.c

+3 −1
Original line number Diff line number Diff line
@@ -182,6 +182,7 @@ struct rockchip_sfc { 
	bool use_dma;

	u32 max_iosize;

	u16 version;

	struct spi_controller *host;

};



static int rockchip_sfc_reset(struct rockchip_sfc *sfc)
@@ -574,6 +575,7 @@ static int rockchip_sfc_probe(struct platform_device *pdev) 


	sfc = spi_controller_get_devdata(host);

	sfc->dev = dev;

	sfc->host = host;



	sfc->regbase = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(sfc->regbase))
@@ -651,8 +653,8 @@ static int rockchip_sfc_probe(struct platform_device *pdev) 


static void rockchip_sfc_remove(struct platform_device *pdev)

{

	struct spi_controller *host = platform_get_drvdata(pdev);

	struct rockchip_sfc *sfc = platform_get_drvdata(pdev);

	struct spi_controller *host = sfc->host;



	spi_unregister_controller(host);