From 859f3f0d751e92ec99c79408a4a7789bfb61a514 Mon Sep 17 00:00:00 2001 From: Carl-Daniel Hailfinger Date: Thu, 2 Dec 2010 21:59:42 +0000 Subject: 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 Acked-by: Uwe Hermann --- flashrom.c | 8 ++++++-- 1 file 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; } -- cgit v1.1