diff options
| -rw-r--r-- | drivers/spi/spi-omap2-mcspi.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/spi/spi-omap2-mcspi.c b/drivers/spi/spi-omap2-mcspi.c index a72127f08e39..965539b0dbfb 100644 --- a/drivers/spi/spi-omap2-mcspi.c +++ b/drivers/spi/spi-omap2-mcspi.c | |||
| @@ -1057,12 +1057,15 @@ static void omap2_mcspi_work(struct omap2_mcspi *mcspi, struct spi_message *m) | |||
| 1057 | status = -EINVAL; | 1057 | status = -EINVAL; |
| 1058 | break; | 1058 | break; |
| 1059 | } | 1059 | } |
| 1060 | if (par_override || t->speed_hz || t->bits_per_word) { | 1060 | if (par_override || |
| 1061 | (t->speed_hz != spi->max_speed_hz) || | ||
| 1062 | (t->bits_per_word != spi->bits_per_word)) { | ||
| 1061 | par_override = 1; | 1063 | par_override = 1; |
| 1062 | status = omap2_mcspi_setup_transfer(spi, t); | 1064 | status = omap2_mcspi_setup_transfer(spi, t); |
| 1063 | if (status < 0) | 1065 | if (status < 0) |
| 1064 | break; | 1066 | break; |
| 1065 | if (!t->speed_hz && !t->bits_per_word) | 1067 | if (t->speed_hz == spi->max_speed_hz && |
| 1068 | t->bits_per_word == spi->bits_per_word) | ||
| 1066 | par_override = 0; | 1069 | par_override = 0; |
| 1067 | } | 1070 | } |
| 1068 | if (cd && cd->cs_per_word) { | 1071 | if (cd && cd->cs_per_word) { |