--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
-@@ -3633,6 +3633,7 @@ static int __spi_validate_bits_per_word(
+@@ -3675,6 +3675,7 @@ static int spi_set_cs_timing(struct spi_
*/
int spi_setup(struct spi_device *spi)
{
unsigned bad_bits, ugly_bits;
int status = 0;
-@@ -3653,6 +3654,14 @@ int spi_setup(struct spi_device *spi)
+@@ -3695,6 +3696,14 @@ int spi_setup(struct spi_device *spi)
(SPI_TX_DUAL | SPI_TX_QUAD | SPI_TX_OCTAL |
SPI_RX_DUAL | SPI_RX_QUAD | SPI_RX_OCTAL)))
return -EINVAL;