diff options
| author | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-06-25 14:08:26 +0100 |
| commit | 1bee1ecf232cd90ad112d78ab5124850b4e5ea09 (patch) | |
| tree | 850cf42ea49ec040c2042fdd8bc61d332461e948 /drivers/spi/spidev.c | |
| parent | edf978a5a17dc9e38625b33821dc71f10c46f694 (diff) | |
| parent | b470e10eb43f19e08245cd87dd3192a8141cfbb5 (diff) | |
Merge remote-tracking branch 'spi/for-5.14' into spi-next
Diffstat (limited to 'drivers/spi/spidev.c')
| -rw-r--r-- | drivers/spi/spidev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index f56e0e975a46..24e9469ea35b 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -59,7 +59,7 @@ static DECLARE_BITMAP(minors, N_SPI_MINORS); * * REVISIT should changing those flags be privileged? */ -#define SPI_MODE_MASK (SPI_CPHA | SPI_CPOL | SPI_CS_HIGH \ +#define SPI_MODE_MASK (SPI_MODE_X_MASK | SPI_CS_HIGH \ | SPI_LSB_FIRST | SPI_3WIRE | SPI_LOOP \ | SPI_NO_CS | SPI_READY | SPI_TX_DUAL \ | SPI_TX_QUAD | SPI_TX_OCTAL | SPI_RX_DUAL \ |