diff options
| author |   Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:33 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-22 19:56:33 +0000 |
| commit | 8f3ed6d0b0db04db8297d951c26c809dd7b4778d (patch) | |
| tree | 5813c89fa9245eb00e617b6dab89ddfe4a029184 /drivers/spi/spi-atmel.c | |
| parent | Linux 5.4-rc8 (diff) | |
| parent | spi: fsl-cpm: Correct the free:ing (diff) | |
| download | wireguard-linux-8f3ed6d0b0db04db8297d951c26c809dd7b4778d.tar.xz wireguard-linux-8f3ed6d0b0db04db8297d951c26c809dd7b4778d.zip | |
Merge branch 'spi-5.4' into spi-linus
Diffstat (limited to 'drivers/spi/spi-atmel.c')
| -rw-r--r-- | drivers/spi/spi-atmel.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c index acf318e7330c..2f8c79ce05c8 100644 --- a/drivers/spi/spi-atmel.c +++ b/drivers/spi/spi-atmel.c @@ -302,7 +302,6 @@ struct atmel_spi { bool use_cs_gpios; bool keep_cs; - bool cs_active; u32 fifo_size; }; @@ -1376,11 +1375,9 @@ static int atmel_spi_one_transfer(struct spi_master *master, &msg->transfers)) { as->keep_cs = true; } else { - as->cs_active = !as->cs_active; - if (as->cs_active) - cs_activate(as, msg->spi); - else - cs_deactivate(as, msg->spi); + cs_deactivate(as, msg->spi); + udelay(10); + cs_activate(as, msg->spi); } } @@ -1403,7 +1400,6 @@ static int atmel_spi_transfer_one_message(struct spi_master *master, atmel_spi_lock(as); cs_activate(as, spi); - as->cs_active = true; as->keep_cs = false; msg->status = 0; |