[PATCH 1/2] cfi: Add intr_restore() to cfi_write_block()

Sebastian Huber sebastian.huber at embedded-brains.de
Fri Jun 16 07:47:20 UTC 2017


Restore the interrupt status in case of a timeout.
---
 sys/dev/cfi/cfi_core.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/dev/cfi/cfi_core.c b/sys/dev/cfi/cfi_core.c
index 1bf687e3cee..e90db06dcef 100644
--- a/sys/dev/cfi/cfi_core.c
+++ b/sys/dev/cfi/cfi_core.c
@@ -647,6 +647,7 @@ cfi_write_block(struct cfi_softc *sc)
 					cfi_write(sc, sc->sc_wrofs + i,
 					    CFI_BCS_BUF_PROG_SETUP);
 					if (sbinuptime() > start + sc->sc_max_timeouts[CFI_TIMEOUT_BUFWRITE]) {
+						intr_restore(intr);
 						error = ETIMEDOUT;
 						goto out;
 					}
-- 
2.12.3



More information about the freebsd-hackers mailing list