Avoid printing the chip locks if chip detection was forced

Lock access may involve flash chip registers which will not be mapped
if automatic detection failed.

Corresponding to flashrom svn r1240.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>

1 files changed, 6 insertions, 2 deletions

diff --git a/flashrom.c b/flashrom.c
index 629cce2..55d4d7b 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -1163,8 +1163,12 @@ notfound:
 	       flash->vendor, flash->name, flash->total_size,
 	       flashbuses_to_text(flash->bustype), base);
 
-	if (flash->printlock)
-		flash->printlock(flash);
+	/* Flash registers will not be mapped if the chip was forced. Lock info
+	 * may be stored in registers, so avoid lock info printing.
+	 */
+	if (!force)
+		if (flash->printlock)
+			flash->printlock(flash);
 
 	return flash;
 }