]> git.baikalelectronics.ru Git - kernel.git/commit
spi: Fix the clamping of spi->max_speed_hz
authorTudor Ambarus <tudor.ambarus@microchip.com>
Wed, 16 Dec 2020 09:23:21 +0000 (11:23 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 30 Dec 2020 13:45:23 +0000 (13:45 +0000)
commit7012ac2d7defdcda50584e5fdcb88e049750606a
tree8c3bc29d125a88570e3cc3b0534e11f6aaee5703
parentf23939cafe103611db4de4a3bac527bc0a45310b
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.

Fixes: 095ab5e2fa2d ("spi: Limit the spi device max speed to controller's max speed")
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20201216092321.413262-1-tudor.ambarus@microchip.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi.c