diff options
| author | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:35 +0000 |
| commit | ca4196aa10087fe3ba3ce2383761898dc95b5e94 (patch) | |
| tree | f870402f36377f3bde4b939da23dda18bc9bc862 /drivers/spi/spidev.c | |
| parent | 8f3ed6d0b0db04db8297d951c26c809dd7b4778d (diff) | |
| parent | ffa119f7c42d29be2dd759bb18cc4d1f45804c6b (diff) | |
| download | linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.gz linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.bz2 linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.zip | |
Merge branch 'spi-5.5' into spi-next
Diffstat (limited to 'drivers/spi/spidev.c')
| -rw-r--r-- | drivers/spi/spidev.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 3ea9d8a3e6e8..1e217e3e9486 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -265,9 +265,11 @@ static int spidev_message(struct spidev_data *spidev, k_tmp->tx_nbits = u_tmp->tx_nbits; k_tmp->rx_nbits = u_tmp->rx_nbits; k_tmp->bits_per_word = u_tmp->bits_per_word; - k_tmp->delay_usecs = u_tmp->delay_usecs; + k_tmp->delay.value = u_tmp->delay_usecs; + k_tmp->delay.unit = SPI_DELAY_UNIT_USECS; k_tmp->speed_hz = u_tmp->speed_hz; - k_tmp->word_delay_usecs = u_tmp->word_delay_usecs; + k_tmp->word_delay.value = u_tmp->word_delay_usecs; + k_tmp->word_delay.unit = SPI_DELAY_UNIT_USECS; if (!k_tmp->speed_hz) k_tmp->speed_hz = spidev->speed_hz; #ifdef VERBOSE |