diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2018-09-25 11:46:55 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2018-09-27 23:29:57 +0100 |
| commit | aea3877e24f3acc6145094848dbb85f9ce85674a (patch) | |
| tree | a61aad463efa773ef8326d927d00b174586f58ea /drivers/spi/spi-mem.c | |
| parent | 73569a50959e4ec63bcf05839a030e799a350de1 (diff) | |
| download | linux-stable-aea3877e24f3acc6145094848dbb85f9ce85674a.tar.gz linux-stable-aea3877e24f3acc6145094848dbb85f9ce85674a.tar.bz2 linux-stable-aea3877e24f3acc6145094848dbb85f9ce85674a.zip | |
spi: spi-mem: Fix inverted logic in op sanity check
On r8a7791/koelsch:
m25p80 spi0.0: error -22 reading 9f
m25p80: probe of spi0.0 failed with error -22
Apparently the logic in spi_mem_check_op() is wrong, rejecting the
spi-mem operation if any buswidth is valid, instead of invalid.
Fixes: 380583227c0c7f52 ("spi: spi-mem: Add extra sanity checks on the op param")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Boris Brezillon <boris.brezillon@bootlin.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi/spi-mem.c')
| -rw-r--r-- | drivers/spi/spi-mem.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c index cc3d425aae56..62a7b80801d2 100644 --- a/drivers/spi/spi-mem.c +++ b/drivers/spi/spi-mem.c @@ -169,10 +169,10 @@ static int spi_mem_check_op(const struct spi_mem_op *op) (op->data.nbytes && !op->data.buswidth)) return -EINVAL; - if (spi_mem_buswidth_is_valid(op->cmd.buswidth) || - spi_mem_buswidth_is_valid(op->addr.buswidth) || - spi_mem_buswidth_is_valid(op->dummy.buswidth) || - spi_mem_buswidth_is_valid(op->data.buswidth)) + if (!spi_mem_buswidth_is_valid(op->cmd.buswidth) || + !spi_mem_buswidth_is_valid(op->addr.buswidth) || + !spi_mem_buswidth_is_valid(op->dummy.buswidth) || + !spi_mem_buswidth_is_valid(op->data.buswidth)) return -EINVAL; return 0; |