]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: Merge up fixes
authorMark Brown <broonie@kernel.org>
Tue, 19 May 2026 08:44:41 +0000 (09:44 +0100)
committerMark Brown <broonie@kernel.org>
Tue, 19 May 2026 08:44:41 +0000 (09:44 +0100)
Help the CI by merging up fixes into the development branch.

1  2 
drivers/spi/spi-ep93xx.c
drivers/spi/spi-qup.c
drivers/spi/spi-sprd.c
drivers/spi/spi-ti-qspi.c

Simple merge
Simple merge
index d27b51698dbd7bb8e4eb386edb844a65f619f245,acebf9c2e795a39ff808ca457b9c0b153cbc4f49..29380938ef65b34327fdbe02d501ff3776c97114
@@@ -989,7 -991,10 +989,8 @@@ err_rpm_put
  disable_clk:
        clk_disable_unprepare(ss->clk);
  release_dma:
-       sprd_spi_dma_release(ss);
+       if (ss->dma.enable)
+               sprd_spi_dma_release(ss);
 -free_controller:
 -      spi_controller_put(sctlr);
  
        return ret;
  }
Simple merge