spi: Fix the clamping of spi->max_speed_hz
PATCH 1/1 spi: Fix the clamping of spi->max_speed_hz
If spi->controller->max_speed_hz is zero, a non-zero spi->max_speed_hz will be overwritten by zero. Make sure spi->controller->max_speed_hz is not zero when clamping spi->max_speed_hz.
Put the spi->controller->max_speed_hz non-zero check higher in the if, so that we avoid a superfluous init to zero when both spi->max_speed_hz and spi->controller->max_speed_hz are zero.
--- drivers/spi/spi.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/spi/spi.c +3 -2
@@ -3378,8 +3378,9 @@ int spi_setup(struct spi_device *spi)if (status)return status; -if (!spi->max_speed_hz || - spi->max_speed_hz > spi->controller->max_speed_hz) +if (spi->controller->max_speed_hz && + (!spi->max_speed_hz || + spi->max_speed_hz > spi->controller->max_speed_hz)) spi->max_speed_hz = spi->controller->max_speed_hz;mutex_lock (&spi->controller->io_mutex);
Signature · 1 line
2.25.1
Quoted 4 lines · Tudor Ambarus
If
spi->controller->max_speed_hzis zero, a non-zerospi->max_speed_hzwill be overwritten by zero. Make surespi->controller->max_speed_hzis not zero when clampingspi->max_speed_hz.
Quoted 8 lines
Put the
spi->controller->max_speed_hznon-zero check higher in the if, so that we avoid a superfluous init to zero when bothspi->max_speed_hzandspi->controller->max_speed_hzare zero.Fixes 9326e4f1e5dd ("spi: Limit the spi device max speed to controller's max speed")Reported-by Geert Uytterhoeven <[email protected]>Suggested-by Geert Uytterhoeven <[email protected]>Signed-off-by Tudor Ambarus <[email protected]>
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Mark Brown
maintainerQuoted 7 lines · Tudor Ambarus
If
spi->controller->max_speed_hzis zero, a non-zerospi->max_speed_hzwill be overwritten by zero. Make surespi->controller->max_speed_hzis not zero when clampingspi->max_speed_hz.Put the
spi->controller->max_speed_hznon-zero check higher in the if, so that we avoid a superfluous init to zero when bothspi->max_speed_hzandspi->controller->max_speed_hzare zero.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
Thanks!
[1/1] spi: Fix the clamping of spi->max_speed_hz
commit: 6820e812dafb4258bc14692f686eec5bde6fba86
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