diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index fc9a59788d2ea..45021d271da2c 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);