diff --git a/flashrom.c b/flashrom.c
index 4fe1843..12d7390 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1224,7 +1224,7 @@
 		flash->mst = mst;
 
 		if (map_flash(flash) != 0)
-			return -1;
+			goto notfound;
 
 		/* We handle a forced match like a real match, we just avoid probing. Note that probe_flash()
 		 * is only called with force=1 after normal probing failed.