diff options
| author | Mark Brown <broonie@kernel.org> | 2020-03-27 18:53:00 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-03-27 18:53:00 +0300 |
| commit | 1ba0b52ea73bd46ff053edea21f5630f5277fefe (patch) | |
| tree | 1a4e561a0e0238a54aff02aa47e20cfcd61522be /drivers/spi/spidev.c | |
| parent | 16fbf79b0f83bc752cee8589279f1ebfe57b3b6e (diff) | |
| parent | ebb3b9a92ba98efa8d0525367e653d5ee6630c1b (diff) | |
| download | linux-1ba0b52ea73bd46ff053edea21f5630f5277fefe.tar.xz | |
Merge branch 'spi-5.7' into spi-next
Diffstat (limited to 'drivers/spi/spidev.c')
| -rw-r--r-- | drivers/spi/spidev.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 2ab6e782f14c..80dd1025b953 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c @@ -275,14 +275,14 @@ static int spidev_message(struct spidev_data *spidev, #ifdef VERBOSE dev_dbg(&spidev->spi->dev, " xfer len %u %s%s%s%dbits %u usec %u usec %uHz\n", - u_tmp->len, - u_tmp->rx_buf ? "rx " : "", - u_tmp->tx_buf ? "tx " : "", - u_tmp->cs_change ? "cs " : "", - u_tmp->bits_per_word ? : spidev->spi->bits_per_word, - u_tmp->delay_usecs, - u_tmp->word_delay_usecs, - u_tmp->speed_hz ? : spidev->spi->max_speed_hz); + k_tmp->len, + k_tmp->rx_buf ? "rx " : "", + k_tmp->tx_buf ? "tx " : "", + k_tmp->cs_change ? "cs " : "", + k_tmp->bits_per_word ? : spidev->spi->bits_per_word, + k_tmp->delay.value, + k_tmp->word_delay.value, + k_tmp->speed_hz ? : spidev->spi->max_speed_hz); #endif spi_message_add_tail(k_tmp, &msg); } @@ -454,10 +454,11 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) spi->max_speed_hz = tmp; retval = spi_setup(spi); - if (retval >= 0) + if (retval == 0) { spidev->speed_hz = tmp; - else - dev_dbg(&spi->dev, "%d Hz (max)\n", tmp); + dev_dbg(&spi->dev, "%d Hz (max)\n", + spidev->speed_hz); + } spi->max_speed_hz = save; } break; |