spi: spi-mem: Compute length only when needed
PATCH 1/1 spi: spi-mem: Compute length only when needed
From: Tudor Ambarus <[email protected]>
When adjust_op_size is defined, len is never used. Move the len computation where it's actually used.
--- drivers/spi/spi-mem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/spi/spi-mem.c +3 -2
@@ -418,12 +418,13 @@ int spi_mem_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)struct spi_controller *ctlr = mem->spi->controller;size_t len; - len =sizeof (op->cmd.opcode) + op->addr.nbytes + op->dummy.nbytes; -if (ctlr->mem_ops && ctlr->mem_ops->adjust_op_size)return ctlr->mem_ops->adjust_op_size (mem, op);if (!ctlr->mem_ops || !ctlr->mem_ops->exec_op) { + len =sizeof (op->cmd.opcode) + op->addr.nbytes + + op->dummy.nbytes; +if (len >spi_max_transfer_size (mem->spi))return -EINVAL ;
Signature · 1 line
2.23.0
Mark Brown
maintainerApplied "spi: spi-mem: Compute length only when needed" to the spi tree
The patch
spi: spi-mem: Compute length only when needed
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
Quoted 1 line
From
c0e035ac56680e74b27fc218c07e70f4b9b8b7a5Mon Sep 17 00:00:00 2001
From: Tudor Ambarus <[email protected]>
Date: Fri, 28 Feb 2020 16:07:44 +0000
Subject: [PATCH] spi: spi-mem: Compute length only when needed
When adjust_op_size is defined, len is never used. Move the len computation where it's actually used.
--- drivers/spi/spi-mem.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/spi/spi-mem.c +3 -2
@@ -418,12 +418,13 @@ int spi_mem_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)struct spi_controller *ctlr = mem->spi->controller;size_t len; - len =sizeof (op->cmd.opcode) + op->addr.nbytes + op->dummy.nbytes; -if (ctlr->mem_ops && ctlr->mem_ops->adjust_op_size)return ctlr->mem_ops->adjust_op_size (mem, op);if (!ctlr->mem_ops || !ctlr->mem_ops->exec_op) { + len =sizeof (op->cmd.opcode) + op->addr.nbytes + + op->dummy.nbytes; +if (len >spi_max_transfer_size (mem->spi))return -EINVAL ;
Signature · 1 line
2.20.1