Merge branch 'spi-5.3' into spi-next

This commit is contained in:
Mark Brown
2019-07-04 17:35:07 +01:00
33 changed files with 2284 additions and 541 deletions

View File

@@ -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)