From 9326e4f1e5dd1a4410c429638d3c412b6fc17040 Mon Sep 17 00:00:00 2001 From: Tudor Ambarus Date: Wed, 9 Dec 2020 19:35:14 +0200 Subject: [PATCH] spi: Limit the spi device max speed to controller's max speed Make sure the max_speed_hz of spi_device does not override the max_speed_hz of controller. Signed-off-by: Tudor Ambarus Link: https://lore.kernel.org/r/20201209173514.93328-1-tudor.ambarus@microchip.com Signed-off-by: Mark Brown --- drivers/spi/spi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index fc9a59788d2e..45021d271da2 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -3369,7 +3369,8 @@ int spi_setup(struct spi_device *spi) if (status) return status; - if (!spi->max_speed_hz) + if (!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);