diff options
| author | Mark Brown | 2019-07-04 18:35:07 +0200 |
|---|---|---|
| committer | Mark Brown | 2019-07-04 18:35:07 +0200 |
| commit | 106dbe24d4146c0804cb025e450ac7af42d72356 (patch) | |
| tree | ad196f245894a8546603f8472619f9e5b73b8265 /drivers/spi/spi-qup.c | |
| parent | Merge branch 'spi-5.2' into spi-linus (diff) | |
| parent | spi: pxa2xx: Add support for Intel Elkhart Lake (diff) | |
| download | kernel-qcow2-linux-106dbe24d4146c0804cb025e450ac7af42d72356.tar.gz kernel-qcow2-linux-106dbe24d4146c0804cb025e450ac7af42d72356.tar.xz kernel-qcow2-linux-106dbe24d4146c0804cb025e450ac7af42d72356.zip | |
Merge branch 'spi-5.3' into spi-next
Diffstat (limited to 'drivers/spi/spi-qup.c')
| -rw-r--r-- | drivers/spi/spi-qup.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index eb8a6a2e91c9..2f559e531100 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -873,10 +873,6 @@ static int spi_qup_transfer_one(struct spi_master *master, else ret = spi_qup_do_pio(spi, xfer, timeout); - if (ret) - goto exit; - -exit: spi_qup_set_state(controller, QUP_STATE_RESET); spin_lock_irqsave(&controller->lock, flags); if (!ret) |