diff options
| author | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-09-15 05:32:06 -0400 |
| commit | b769c5ba8aedc395ed04abe6db84a556d28beec1 (patch) | |
| tree | dd00c955f899f65785d60c2b4673785c28054b30 /drivers/spi/spi-bcm-qspi.c | |
| parent | 262a2f33454fcecdc2032ca84d6fecdb08233468 (diff) | |
| parent | fdeae8f5a2e5eb3fcc9c295bfb28503c3abd4d6e (diff) | |
Merge branch 'spi-5.4' into spi-next
Diffstat (limited to 'drivers/spi/spi-bcm-qspi.c')
| -rw-r--r-- | drivers/spi/spi-bcm-qspi.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-bcm-qspi.c b/drivers/spi/spi-bcm-qspi.c index 0dbfd2496ab8..7a3531856491 100644 --- a/drivers/spi/spi-bcm-qspi.c +++ b/drivers/spi/spi-bcm-qspi.c | |||
| @@ -897,6 +897,7 @@ static int bcm_qspi_transfer_one(struct spi_master *master, | |||
| 897 | 897 | ||
| 898 | read_from_hw(qspi, slots); | 898 | read_from_hw(qspi, slots); |
| 899 | } | 899 | } |
| 900 | bcm_qspi_enable_bspi(qspi); | ||
| 900 | 901 | ||
| 901 | return 0; | 902 | return 0; |
| 902 | } | 903 | } |