Please see attached fr.cacheprobe_goto.patch.
For those who fiercly advocate against goto; please compare fr.cacheprobe_goto.patch (which I propose to commit) with the mess in fr.cacheprobe_if.patch (which is not signed off and only included for reference) - goto ftw!
Timing:
flashrom r3386: 1.099s flashrom r3387 (10ms patch): 1.880s flashrom r3387 + this patch: 0.882s
May be considered petty to optimize away this one second, but it is quite noticeable, and not neccessary.
//Peter