Commit 859f3f0d authored by Carl-Daniel Hailfinger's avatar Carl-Daniel Hailfinger
Browse files

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: default avatarCarl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: default avatarUwe Hermann <uwe@hermann-uwe.de>
parent 742999c6
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment