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

Merge tag 'spi-fix-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "A small set of fixes here.

  One core fix for error handling when we fail to set up the hardware
  before initiating a transfer and another one reverting a change in the
  core which broke Raspberry Pi in common use cases as part of some
  optimization work.

  There's also a couple of driver specific fixes"

* tag 'spi-fix-v5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: abort spi_sync if failed to prepare_transfer_hardware
  spi: spi-fsl-spi: call spi_finalize_current_message() at the end
  spi: bitbang: Fix NULL pointer dereference in spi_unregister_master
  spi: Fix Raspberry Pi breakage
parents d1fdb6d8 f3440d9a

drivers/spi/spi-bitbang.c

+1 −1
Original line number Diff line number Diff line
@@ -406,7 +406,7 @@ int spi_bitbang_start(struct spi_bitbang *bitbang) 
	if (ret)

		spi_master_put(master);



	return 0;

	return ret;

}

EXPORT_SYMBOL_GPL(spi_bitbang_start);

drivers/spi/spi-fsl-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -428,7 +428,6 @@ static int fsl_spi_do_one_msg(struct spi_master *master, 
	}



	m->status = status;

	spi_finalize_current_message(master);



	if (status || !cs_change) {

		ndelay(nsecs);
@@ -436,6 +435,7 @@ static int fsl_spi_do_one_msg(struct spi_master *master, 
	}



	fsl_spi_setup_transfer(spi, NULL);

	spi_finalize_current_message(master);

	return 0;

}

drivers/spi/spi.c

+8 −3
Original line number Diff line number Diff line
@@ -1181,10 +1181,10 @@ out: 
	if (msg->status && ctlr->handle_err)

		ctlr->handle_err(ctlr, msg);



	spi_finalize_current_message(ctlr);



	spi_res_release(ctlr, msg);



	spi_finalize_current_message(ctlr);



	return ret;

}
@@ -1307,10 +1307,15 @@ static void __spi_pump_messages(struct spi_controller *ctlr, bool in_kthread) 
		ret = ctlr->prepare_transfer_hardware(ctlr);

		if (ret) {

			dev_err(&ctlr->dev,

				"failed to prepare transfer hardware\n");

				"failed to prepare transfer hardware: %d\n",

				ret);



			if (ctlr->auto_runtime_pm)

				pm_runtime_put(ctlr->dev.parent);



			ctlr->cur_msg->status = ret;

			spi_finalize_current_message(ctlr);



			mutex_unlock(&ctlr->io_mutex);

			return;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE