diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-07 22:35:27 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-07 22:35:27 +0100 |
| commit | 5fe7bd5a37ff0d77936f8e38313db5da2dd53f70 (patch) | |
| tree | 5012e70d0993aa23466e06012d2bfb98ba04aa29 /drivers/fpga/machxo2-spi.c | |
| parent | 48a78c66ad5d9d4f918182335d6e5726e7008085 (diff) | |
| parent | 67a12ae52599c9f2f24ef14adb43fc3b164792b5 (diff) | |
Merge branch 'spi-5.15' into spi-5.16
Diffstat (limited to 'drivers/fpga/machxo2-spi.c')
| -rw-r--r-- | drivers/fpga/machxo2-spi.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/machxo2-spi.c index 1afb41aa20d7..ea2ec3c6815c 100644 --- a/drivers/fpga/machxo2-spi.c +++ b/drivers/fpga/machxo2-spi.c @@ -225,8 +225,10 @@ static int machxo2_write_init(struct fpga_manager *mgr, goto fail; get_status(spi, &status); - if (test_bit(FAIL, &status)) + if (test_bit(FAIL, &status)) { + ret = -EINVAL; goto fail; + } dump_status_reg(&status); spi_message_init(&msg); @@ -313,6 +315,7 @@ static int machxo2_write_complete(struct fpga_manager *mgr, dump_status_reg(&status); if (!test_bit(DONE, &status)) { machxo2_cleanup(mgr); + ret = -EINVAL; goto fail; } @@ -335,6 +338,7 @@ static int machxo2_write_complete(struct fpga_manager *mgr, break; if (++refreshloop == MACHXO2_MAX_REFRESH_LOOP) { machxo2_cleanup(mgr); + ret = -EINVAL; goto fail; } } while (1); |