diff options
| author | Mark Brown <broonie@kernel.org> | 2021-08-26 17:09:52 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-08-26 17:09:52 +0300 |
| commit | 6e9c846aa0c53673c5d53925a6122aa0e53a9795 (patch) | |
| tree | f5079b0c50765da8661050b7727d87458fdbde65 /drivers/spi/spi.c | |
| parent | d5f78f50fff3c69915bde28be901b8da56da7e06 (diff) | |
| parent | 26cfc0dbe43aae60dc03af27077775244f26c167 (diff) | |
| download | linux-6e9c846aa0c53673c5d53925a6122aa0e53a9795.tar.xz | |
Merge remote-tracking branch 'spi/for-5.15' into spi-next
Diffstat (limited to 'drivers/spi/spi.c')
| -rw-r--r-- | drivers/spi/spi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index e4dc593b1f32..65d14af9c015 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -846,9 +846,9 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) || !spi->controller->set_cs_timing) { if (activate) - spi_delay_exec(&spi->controller->cs_setup, NULL); + spi_delay_exec(&spi->cs_setup, NULL); else - spi_delay_exec(&spi->controller->cs_hold, NULL); + spi_delay_exec(&spi->cs_hold, NULL); } if (spi->mode & SPI_CS_HIGH) @@ -891,7 +891,7 @@ static void spi_set_cs(struct spi_device *spi, bool enable, bool force) if (spi->cs_gpiod || gpio_is_valid(spi->cs_gpio) || !spi->controller->set_cs_timing) { if (!activate) - spi_delay_exec(&spi->controller->cs_inactive, NULL); + spi_delay_exec(&spi->cs_inactive, NULL); } } |