]> git.itanic.dy.fi Git - linux-stable/commit
spi: Fix error code checking in spi_mem_exec_op()
authorFlorian Fainelli <florian.fainelli@broadcom.com>
Wed, 13 Mar 2024 19:45:30 +0000 (12:45 -0700)
committerMark Brown <broonie@kernel.org>
Thu, 14 Mar 2024 14:14:20 +0000 (14:14 +0000)
commit29895ce18311ddd702973ddb3a6c687db663e0fb
tree95b5bd2e6f5a01549262bcc002cf64e7459ea868
parentaa0162dc0dd95c3bf248e3c78068760094e8f64b
spi: Fix error code checking in spi_mem_exec_op()

After commit cff49d58f57e ("spi: Unify error codes by replacing -ENOTSUPP with
-EOPNOTSUPP"), our SPI NOR flashes would stop probing with the following
visible in the kernel log:

[    2.196300] brcmstb_qspi f0440920.qspi: using bspi-mspi mode
[    2.210295] spi-nor: probe of spi1.0 failed with error -95

It turns out that the check in spi_mem_exec_op() was changed to check
for -ENOTSUPP (old error code) or -EOPNOTSUPP (new error code), but this
means that for drivers that were converted, the second condition is now
true, and we stop falling through like we used to. Fix the error to
check for neither error being neither -ENOTSUPP *nor* -EOPNOTSUPP.

Fixes: cff49d58f57e ("spi: Unify error codes by replacing -ENOTSUPP with -EOPNOTSUPP")
Reviewed-by: Michael Walle <mwalle@kernel.org>
Reviewed-by: Pratyush Yadav <pratyush@kernel.org>
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Tudor Ambarus <tudor.ambarus@linaro.org>
Link: https://msgid.link/r/20240313194530.3150446-1-florian.fainelli@broadcom.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-mem.c