diff options
author | Jarkko Nikula <jarkko.nikula@linux.intel.com> | 2015-09-15 09:26:15 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-09-16 15:53:19 -0400 |
commit | 8cf3af32902d14f6a0fbc4ad9a3025d9e7d4701b (patch) | |
tree | a434d860f7af79c3871822cf10a74d41df458b29 | |
parent | 6ff33f3902c3b1c5d0db6b1e2c70b6d76fba357f (diff) |
spi: octeon: Use transfer speed unconditionally
SPI core validates the transfer speed and defaults to spi->max_speed_hz in
case the transfer speed is not set.
Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r-- | drivers/spi/spi-octeon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c index e99d6a93d394..07e4ce8273df 100644 --- a/drivers/spi/spi-octeon.c +++ b/drivers/spi/spi-octeon.c | |||
@@ -65,7 +65,7 @@ static int octeon_spi_do_transfer(struct octeon_spi *p, | |||
65 | cpha = mode & SPI_CPHA; | 65 | cpha = mode & SPI_CPHA; |
66 | cpol = mode & SPI_CPOL; | 66 | cpol = mode & SPI_CPOL; |
67 | 67 | ||
68 | speed_hz = xfer->speed_hz ? : spi->max_speed_hz; | 68 | speed_hz = xfer->speed_hz; |
69 | 69 | ||
70 | clkdiv = octeon_get_io_clock_rate() / (2 * speed_hz); | 70 | clkdiv = octeon_get_io_clock_rate() / (2 * speed_hz); |
71 | 71 | ||