Skip to content

Commit f884f5d

Browse files
committed
spi: atmel-quadspi: add missed changes during v6.6.9 migration from v6.1.4
During kernel migration from v6.1.4 to v6.6.9, usually at91/spi branch is ported first and then by taking at91/spi branch as base for porting the at91/spi-nor branch. We missed to take at91/spi as base instead we cherry-picked only required commits and ported at91/spi-nor branch, which causes conflicts and few changes missed when resolving conflicts. Now the missed changes are ported on top of at91/spi-nor branch and sending as separate PR. NOTE: During next version of kernel migration this commit should be ignored when the ported at91/spi branch is taken as base for at91/spi-nor branch. Always first pull-request should be send from at91/spi and then at91/spi-nor to avoid conflicts. This is related to commit id 3cb8f23. Signed-off-by: Durai Manickam KR <durai.manickamkr@microchip.com>
1 parent 3cb8f23 commit f884f5d

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

drivers/spi/atmel-quadspi.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -920,11 +920,8 @@ static int atmel_qspi_sama7g5_transfer(struct spi_mem *mem,
920920

921921
/* Release the chip-select. */
922922
ret = atmel_qspi_reg_sync(aq);
923-
if (ret) {
924-
pm_runtime_mark_last_busy(&aq->pdev->dev);
925-
pm_runtime_put_autosuspend(&aq->pdev->dev);
923+
if (ret)
926924
return ret;
927-
}
928925
atmel_qspi_write(QSPI_CR_LASTXFER, aq, QSPI_CR);
929926

930927
return atmel_qspi_wait_for_completion(aq, QSPI_SR_CSRA);

0 commit comments

Comments
 (0)