Commit e618ee89 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi fixes from Mark Brown:
 "A couple of cleanups for the error handling in the Freescale drivers"

* tag 'spi-fix-v6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: fsl-spi: Remove redundant probe error message
  spi: fsl-qspi: Fix double cleanup in probe error path
parents 2f3e5ef2 82bedbfe

drivers/spi/spi-fsl-qspi.c

+2 −6
Original line number Diff line number Diff line
@@ -949,24 +949,20 @@ static int fsl_qspi_probe(struct platform_device *pdev) 


	ret = devm_add_action_or_reset(dev, fsl_qspi_cleanup, q);

	if (ret)

		goto err_destroy_mutex;

		goto err_put_ctrl;



	ret = devm_spi_register_controller(dev, ctlr);

	if (ret)

		goto err_destroy_mutex;

		goto err_put_ctrl;



	return 0;



err_destroy_mutex:

	mutex_destroy(&q->lock);



err_disable_clk:

	fsl_qspi_clk_disable_unprep(q);



err_put_ctrl:

	spi_controller_put(ctlr);



	dev_err(dev, "Freescale QuadSPI probe failed\n");

	return ret;

}