diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-05 05:24:06 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-07-05 05:24:06 -1000 |
| commit | 9c9330c764b01519500a656cf3ffab76ff481878 (patch) | |
| tree | ce0bb72e704152e6dfc58c4c38862ab302bea77b /drivers/spi/spi.c | |
| parent | 7404ce51637231382873d0b55edabc2f3b841a9d (diff) | |
| parent | 7fc2c3dcae28347a30ccd76c8817e5719005f1c3 (diff) | |
| download | linux-2.6-9c9330c764b01519500a656cf3ffab76ff481878.tar.gz linux-2.6-9c9330c764b01519500a656cf3ffab76ff481878.zip | |
Merge tag 'spi-fix-v7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A small set of fixes that came in since -rc1, we have one core fix for
shutting down target mode properly if the system suspends while it's
running plus a small set of fairly unremarkable device specific fixes.
There's also a couple of pure DT binding changes for Renesas SoCs, the
power domains one allows some SoCs to be correctly described with
existing code"
* tag 'spi-fix-v7.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: rzv2h-rspi: Fix DMA transfer error handling for signal interruption
spi: dt-bindings: snps,dw-apb-ssi: add 'power-domains' property
spi: dt-bindings: snps,dw-apb-ssi: drop superfluous RZ/N1 entry
spi: dw: use the correct error msg if request_irq() fails
spi: dw: fix first spi transfer with dma always fallback to PIO
spi: core: Abort active target transfer on controller suspend
spi: sh-msiof: abort transfers when reset times out
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 70f050ebbc4f..d9e6b4b87c89 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3670,6 +3670,9 @@ int spi_controller_suspend(struct spi_controller *ctlr) { int ret = 0; + if (ctlr->cur_msg && spi_controller_is_target(ctlr) && ctlr->target_abort) + ctlr->target_abort(ctlr); + /* Basically no-ops for non-queued controllers */ if (ctlr->queued) { ret = spi_stop_queue(ctlr); |