diff options
| author | Praveen Talari <praveen.talari@oss.qualcomm.com> | 2026-07-16 13:55:45 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-07-16 16:57:02 +0100 |
| commit | 2c1c13da3a3a639d2ac7221e1a5e57945cbc7235 (patch) | |
| tree | a7d2a69df2e62d87ee13338b0ddf6f0990efc9dd /drivers/spi | |
| parent | 4bc5a274edab3f9afd11ec500eb526de7e7d91ae (diff) | |
| download | linux-next-2c1c13da3a3a639d2ac7221e1a5e57945cbc7235.tar.gz linux-next-2c1c13da3a3a639d2ac7221e1a5e57945cbc7235.zip | |
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()")
Reported-by: kernel test robot <lkp@intel.com>
Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/r/202607122241.qzP3QAXF-lkp@intel.com/
Signed-off-by: Praveen Talari <praveen.talari@oss.qualcomm.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Acked-by: Mukesh Kumar Savaliya <mukesh.savaliya@oss.qualcomm.com>
Link: https://patch.msgid.link/20260716-fix_return_error_code-v1-1-3295003aacd5@oss.qualcomm.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-geni-qcom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/spi/spi-geni-qcom.c b/drivers/spi/spi-geni-qcom.c index 2914d781dbf5..d262206ed663 100644 --- a/drivers/spi/spi-geni-qcom.c +++ b/drivers/spi/spi-geni-qcom.c @@ -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); |