diff options
| author | Tony Lindgren <tony@atomide.com> | 2015-11-12 20:58:21 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-11-12 20:58:21 +0300 |
| commit | ff6d03b9d9cad592320ce21e9b22befe56ebe6b6 (patch) | |
| tree | da02d83177a107f92c446dbf7a93bdc1bac96cdf /drivers/spi/spi-txx9.c | |
| parent | 7ef71b70e18a82bb363905f72672317d0e1e8810 (diff) | |
| parent | 469689a45f78505d864210b3a5d75404eb7f24ee (diff) | |
| download | linux-ff6d03b9d9cad592320ce21e9b22befe56ebe6b6.tar.xz | |
Merge branch 'x15-audio-fixes' into omap-for-v4.4/fixes
Diffstat (limited to 'drivers/spi/spi-txx9.c')
| -rw-r--r-- | drivers/spi/spi-txx9.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-txx9.c b/drivers/spi/spi-txx9.c index 9190124b6d90..d69f8f8f3fa6 100644 --- a/drivers/spi/spi-txx9.c +++ b/drivers/spi/spi-txx9.c @@ -181,7 +181,7 @@ static void txx9spi_work_one(struct txx9spi *c, struct spi_message *m) u32 data; unsigned int len = t->len; unsigned int wsize; - u32 speed_hz = t->speed_hz ? : spi->max_speed_hz; + u32 speed_hz = t->speed_hz; u8 bits_per_word = t->bits_per_word; wsize = bits_per_word >> 3; /* in bytes */ |