Unverified Commit aea3877e authored Sep 25, 2018 by Geert Uytterhoeven Committed by Mark Brown Sep 27, 2018

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: 38058322 ("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>

parent 73569a50

drivers/spi/spi-mem.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -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;

Admin message