diff options
| author | Tom Rini <trini@konsulko.com> | 2025-10-28 10:32:26 -0600 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2025-10-28 10:33:00 -0600 |
| commit | 094593bf82e78f913c32d10de9c7dbed0591abe9 (patch) | |
| tree | 52b3b4104728ff791c67e22c9b2c95b4de7645dc | |
| parent | 644b4650ee57c429bede77f44752cc867dac0e00 (diff) | |
| parent | 1a5129d3dafda90914972ce78db20f7eb6bc9fde (diff) | |
Merge patch series "spi: cadence_qspi: Fix Smatch reported issues"
Andrew Goodbody <andrew.goodbody@linaro.org> says:
Smatch reported issues with an off by 1 error in a test for a timeout
and also an error exit that did not set an error code.
Link: https://lore.kernel.org/r/20250812-cadence_qspi-v1-0-0d693d810145@linaro.org
| -rw-r--r-- | drivers/spi/cadence_qspi.c | 2 | ||||
| -rw-r--r-- | drivers/spi/cadence_qspi_apb.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/cadence_qspi.c b/drivers/spi/cadence_qspi.c index 599596f9f08..9b45cab9c04 100644 --- a/drivers/spi/cadence_qspi.c +++ b/drivers/spi/cadence_qspi.c @@ -142,7 +142,7 @@ static int spi_calibration(struct udevice *bus, uint hz) if (range_lo == -1) { puts("SF: Calibration failed (low range)\n"); - return err; + return -EIO; } /* Disable QSPI for subsequent initialization */ diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c index 4696c09f754..0d4bc685f5d 100644 --- a/drivers/spi/cadence_qspi_apb.c +++ b/drivers/spi/cadence_qspi_apb.c @@ -354,7 +354,7 @@ void cadence_qspi_apb_controller_init(struct cadence_spi_priv *priv) int cadence_qspi_apb_exec_flash_cmd(void *reg_base, unsigned int reg) { - unsigned int retry = CQSPI_REG_RETRY; + int retry = CQSPI_REG_RETRY; /* Write the CMDCTRL without start execution. */ writel(reg, reg_base + CQSPI_REG_CMDCTRL); @@ -369,7 +369,7 @@ int cadence_qspi_apb_exec_flash_cmd(void *reg_base, unsigned int reg) udelay(1); } - if (!retry) { + if (retry == -1) { printf("QSPI: flash command execution timeout\n"); return -EIO; } |