diff options
| author | Martin Schiller <ms@dev.tdt.de> | 2017-11-23 06:24:57 +0100 |
|---|---|---|
| committer | David Hendricks <david.hendricks@gmail.com> | 2017-12-11 03:37:30 +0000 |
| commit | 57a3b731daa8f0a6ed9d193b1b9e03216b66a802 (patch) | |
| tree | 3ff81dcdd9f0991d076757b16979e8ba5b792ed4 /flashrom.c | |
| parent | 48729d31a6d5dcf9ed887df332518594e1ac6310 (diff) | |
| download | flashrom-57a3b731daa8f0a6ed9d193b1b9e03216b66a802.tar.gz flashrom-57a3b731daa8f0a6ed9d193b1b9e03216b66a802.tar.bz2 flashrom-57a3b731daa8f0a6ed9d193b1b9e03216b66a802.zip | |
Do not stop probing for flashchips after map_flash() failed
Instead, continue probing the next chip.
This fixes the problem that flashrom aborts probing for
flashchips if one big flashchip (e.g. 32M/64M) can't be mapped
because of activated CONFIG_STRICT_DEVMEM kernel option.
Change-Id: Iaecfb6d30a5152c8c4b5d2804efacac85fc615f9
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
Reviewed-on: https://review.coreboot.org/22685
Reviewed-by: David Hendricks <david.hendricks@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'flashrom.c')
| -rw-r--r-- | flashrom.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1224,7 +1224,7 @@ int probe_flash(struct registered_master *mst, int startchip, struct flashctx *f flash->mst = mst; if (map_flash(flash) != 0) - return -1; + goto notfound; /* We handle a forced match like a real match, we just avoid probing. Note that probe_flash() * is only called with force=1 after normal probing failed. |