Message ID | 1440175235-9677-1-git-send-email-broonie@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 7dc9fbc342deb2e2658ebdecb5ffd7ff57945a66 |
Headers | show |
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 08861a0..67733ef 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2035,6 +2035,8 @@ static int __spi_validate(struct spi_device *spi, struct spi_message *message) if (!xfer->speed_hz) xfer->speed_hz = spi->max_speed_hz; + if (!xfer->speed_hz) + xfer->speed_hz = master->max_speed_hz; if (master->max_speed_hz && xfer->speed_hz > master->max_speed_hz)
If a slave appears with no maximum transfer speed specified fall back to using the maximum for the master instead. It's questionable if we should let slaves do this but let's be defensive. Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/spi/spi.c | 2 ++ 1 file changed, 2 insertions(+)