From: Mark Brown <broonie@kernel.org>
Date: Tue, 19 May 2026 08:44:41 +0000 (+0100)
Subject: spi: Merge up fixes
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58c7f6a2c3459d5af5770c0c70db8c59dfedfb16;p=thirdparty%2Fkernel%2Flinux.git

spi: Merge up fixes

Help the CI by merging up fixes into the development branch.
---

58c7f6a2c3459d5af5770c0c70db8c59dfedfb16
diff --cc drivers/spi/spi-sprd.c
index d27b51698dbd7,acebf9c2e795a..29380938ef65b
--- a/drivers/spi/spi-sprd.c
+++ b/drivers/spi/spi-sprd.c
@@@ -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;
  }