Fix handling of write protection at register space address +2

Since r1833 we added the offset of the virtual register in several
functions, which produced segfaults. This patch renames a few
parameters and reorganizes/fixes various parts of the
changelock_regspace2_block() function - hence the rather big diff.

Thanks to Roman Lebedev for reporting this issue and testing numerous
revisions of this patch.

Corresponding to flashrom svn r1859.

Signed-off-by: Stefan Tauner <>
Acked-by: Stefan Tauner <>
2 files changed