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 <[email protected]>
---
drivers/spi/spi-mem.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
index cc3d425aae56c634..62a7b80801d22098 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;
--
2.17.1
On Tue, 25 Sep 2018 11:46:55 +0200
Geert Uytterhoeven <[email protected]> wrote:
> 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 <[email protected]>
Reviewed-by: Boris Brezillon <[email protected]>
Sorry for the mess :-/, and thanks for reporting/fixing it.
> ---
> drivers/spi/spi-mem.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/spi/spi-mem.c b/drivers/spi/spi-mem.c
> index cc3d425aae56c634..62a7b80801d22098 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;
The patch
spi: spi-mem: Fix inverted logic in op sanity check
has been applied to the spi tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From aea3877e24f3acc6145094848dbb85f9ce85674a Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <[email protected]>
Date: Tue, 25 Sep 2018 11:46:55 +0200
Subject: [PATCH] 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 <[email protected]>
Reviewed-by: Boris Brezillon <[email protected]>
Signed-off-by: Mark Brown <[email protected]>
---
drivers/spi/spi-mem.c | 8 ++++----
1 file 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;
--
2.19.0