Skip to content

Commit a4f9557

Browse files
committed
Merge branch 'linux-6.6-trunk/at91/spi-nor' into linux-6.6-mchp
2 parents ae6c8f1 + f884f5d commit a4f9557

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
@@ -924,11 +924,8 @@ static int atmel_qspi_sama7g5_transfer(struct spi_mem *mem,
924924

925925
/* Release the chip-select. */
926926
ret = atmel_qspi_reg_sync(aq);
927-
if (ret) {
928-
pm_runtime_mark_last_busy(&aq->pdev->dev);
929-
pm_runtime_put_autosuspend(&aq->pdev->dev);
927+
if (ret)
930928
return ret;
931-
}
932929
atmel_qspi_write(QSPI_CR_LASTXFER, aq, QSPI_CR);
933930

934931
return atmel_qspi_wait_for_completion(aq, QSPI_SR_CSRA);

0 commit comments

Comments
 (0)