From: Mark Brown Date: Thu, 20 Aug 2015 18:52:18 +0000 (-0700) Subject: spi: Fall back to master maximum speed if no slave speed specified X-Git-Tag: next-20150824~40^2~5^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7dc9fbc342deb2e2658ebdecb5ffd7ff57945a66;p=uclinux-h8%2Flinux.git spi: Fall back to master maximum speed if no slave speed specified 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 --- diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index cf8b91b23a76..637d892b316d 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -1860,6 +1860,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)