kernel: update kernel 4.9 to 4.9.14

[openwrt/openwrt.git] / target / linux / ipq806x / patches-4.9 / 0014-spi-qup-allow-block-mode-to-generate-multiple-transa.patch

diff --git a/target/linux/ipq806x/patches-4.9/0014-spi-qup-allow-block-mode-to-generate-multiple-transa.patch b/target/linux/ipq806x/patches-4.9/0014-spi-qup-allow-block-mode-to-generate-multiple-transa.patch
index 19b36aaaddad5de56bca7e1e80988488d3842655..6c275f61d3eae7c02f5456d5e4da4e82af50845d 100644 (file)
--- a/target/linux/ipq806x/patches-4.9/0014-spi-qup-allow-block-mode-to-generate-multiple-transa.patch
+++ b/target/linux/ipq806x/patches-4.9/0014-spi-qup-allow-block-mode-to-generate-multiple-transa.patch
@@ -173,37 +173,37 @@ Signed-off-by: Matthew McClintock <mmcclint@codeaurora.org>
 +                      qup->n_words = SPI_MAX_XFER;
 +              else
 +                      qup->n_words = n_words % SPI_MAX_XFER;
- 
--      if (qup->mode == QUP_IO_M_MODE_FIFO)
--              spi_qup_write(qup, xfer);
++
 +              if (qup->tx_buf && offset)
 +                      qup->tx_buf = xfer->tx_buf + offset * SPI_MAX_XFER;
- 
--      ret = spi_qup_set_state(qup, QUP_STATE_RUN);
--      if (ret) {
--              dev_warn(qup->dev, "cannot set RUN state\n");
--              return ret;
--      }
++
 +              if (qup->rx_buf && offset)
 +                      qup->rx_buf = xfer->rx_buf + offset * SPI_MAX_XFER;
- 
--      if (!wait_for_completion_timeout(&qup->done, timeout))
--              return -ETIMEDOUT;
++
 +              /* if the transaction is small enough, we need
 +               * to fallback to FIFO mode */
 +              if (qup->n_words <= (qup->in_fifo_sz / sizeof(u32)))
 +                      qup->mode = QUP_IO_M_MODE_FIFO;
-+
+ 
+-      if (qup->mode == QUP_IO_M_MODE_FIFO)
+-              spi_qup_write(qup, xfer);
 +              ret = spi_qup_io_config(spi, xfer);
 +              if (ret)
 +                      return ret;
-+
+ 
+-      ret = spi_qup_set_state(qup, QUP_STATE_RUN);
+-      if (ret) {
+-              dev_warn(qup->dev, "cannot set RUN state\n");
+-              return ret;
+-      }
 +              ret = spi_qup_set_state(qup, QUP_STATE_RUN);
 +              if (ret) {
 +                      dev_warn(qup->dev, "cannot set RUN state\n");
 +                      return ret;
 +              }
-+
+ 
+-      if (!wait_for_completion_timeout(&qup->done, timeout))
+-              return -ETIMEDOUT;
 +              ret = spi_qup_set_state(qup, QUP_STATE_PAUSE);
 +              if (ret) {
 +                      dev_warn(qup->dev, "cannot set PAUSE state\n");