Skip to contentSkip to conversation

spi: geni-qcom: Fix sticky ret causing wrong return value on invalid proto

PATCH In review Praveen Talari 4 participants 4 messages Jul 16 – Jul 18

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 spi: geni-qcom: Fix sticky ret causing wrong return value on invalid proto

spi_geni_init() reuses 'ret' after it has already been set by the runtime PM acquire check earlier in the function. When an invalid protocol is later detected, the function returns this stale 'ret' value instead of a proper error code, so it can end up returning 0 (or some other non-error value) even though the protocol check failed.

Fix this by returning -EINVAL directly on both invalid-proto paths.

Fixes d8e9ea989acb ("spi: qcom-geni: Fix missing error check on pm_runtime_get_sync()")
---
 drivers/spi/spi-geni-qcom.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/spi/spi-geni-qcom.c +2 -2
index 2914d781dbf5..d262206ed663 100644
@@ -634,7 +634,7 @@ static int spi_geni_init(struct spi_geni_master *mas)
 	if (spi->target) {
 		if (proto != GENI_SE_SPI_SLAVE) {
 			dev_err(mas->dev, "Invalid proto %d\n", proto);
-			return ret;
+			return -EINVAL;
 		}
 		spi_slv_setup(mas);
 	} else if (proto == GENI_SE_INVALID_PROTO) {
@@ -645,7 +645,7 @@ static int spi_geni_init(struct spi_geni_master *mas)
 		}
 	} else if (proto != GENI_SE_SPI) {
 		dev_err(mas->dev, "Invalid proto %d\n", proto);
-		return ret;
+		return -EINVAL;
 	}
 	mas->tx_fifo_depth = geni_se_get_tx_fifo_depth(se);
 

---
base-commit: cc2b5f627e8ccbae1188ef2d8be3e451d7f933a5
change-id: 20260716-fix_return_error_code-d1a794620d0f

Best regards,

Signature · 1 line
Praveen Talari <[email protected]>
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Praveen Talari

spi_geni_init() reuses 'ret' after it has already been set by the runtime PM acquire check earlier in the function. When an invalid protocol is later detected, the function returns this stale 'ret' value instead of a proper error code, so it can end up returning 0 (or some other non-error value) even though the protocol check failed.

Quoted 8 lines

Fix this by returning -EINVAL directly on both invalid-proto paths.

Fixes d8e9ea989acb ("spi: qcom-geni: Fix missing error check on pm_runtime_get_sync()")

---

Konrad

Acked-by on v1 1/1
#2 lore raw
In reply to Praveen Talari
Quoted 9 lines · Praveen Talari

spi_geni_init() reuses 'ret' after it has already been set by the runtime PM acquire check earlier in the function. When an invalid protocol is later detected, the function returns this stale 'ret' value instead of a proper error code, so it can end up returning 0 (or some other non-error value) even though the protocol check failed.

Fix this by returning -EINVAL directly on both invalid-proto paths.

Quoted 8 lines
Fixes d8e9ea989acb ("spi: qcom-geni: Fix missing error check on pm_runtime_get_sync()")
---
  drivers/spi/spi-geni-qcom.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
maintainer
#3 lore raw
In reply to Praveen Talari
Quoted 1 line · Praveen Talari

spi: geni-qcom: Fix sticky ret causing wrong return value on invalid proto

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-7.3

Thanks!

[1/1] spi: geni-qcom: Fix sticky ret causing wrong return value on invalid proto

      https://git.kernel.org/broonie/spi/c/2c1c13da3a3a

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark