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/spi-bcm63xx-hsspi.c | |
| parent | 8f3ed6d0b0db04db8297d951c26c809dd7b4778d (diff) | |
| parent | ffa119f7c42d29be2dd759bb18cc4d1f45804c6b (diff) | |
| download | linux-ca4196aa10087fe3ba3ce2383761898dc95b5e94.tar.bz2 | |
Merge branch 'spi-5.5' into spi-next
Diffstat (limited to 'drivers/spi/spi-bcm63xx-hsspi.c')
| -rw-r--r-- | drivers/spi/spi-bcm63xx-hsspi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c index c6836a931dbf..7327309ea3d5 100644 --- a/drivers/spi/spi-bcm63xx-hsspi.c +++ b/drivers/spi/spi-bcm63xx-hsspi.c @@ -291,8 +291,7 @@ static int bcm63xx_hsspi_transfer_one(struct spi_master *master, msg->actual_length += t->len; - if (t->delay_usecs) - udelay(t->delay_usecs); + spi_transfer_delay_exec(t); if (t->cs_change) bcm63xx_hsspi_set_cs(bs, spi->chip_select, false); |