openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 07:02:34 +02:00
Code Issues Releases Wiki Activity

Handle NULL probe, erase and write function pointers in the flashchips table

Browse Source 
The read pointer was already checked properly.

Corresponding to flashrom svn r218 and coreboot v2 svn r3273.

Signed-off-by: Peter Stuge <peter@stuge.se>
Acked-by: Stefan Reinauer <stepan@coresystems.de>
This commit is contained in:
Peter Stuge 2008-04-28 14:47:30 +00:00
parent ef300238b6
commit f31104cf3b
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
flashrom.c
View File

@ -111,6 +111,11 @@ struct flashchip *probe_flash(struct flashchip *flash)
}
printf_debug("Probing for %s %s, %d KB: ",
flash->vendor, flash->name, flash->total_size);
if (!flash->probe) {
printf_debug("failed! flashrom has no probe function for this flash chip.\n");
flash++;
continue;
}
size = flash->total_size * 1024;
@ -425,6 +430,10 @@ int main(int argc, char *argv[])
if (erase_it) {
printf("Erasing flash chip\n");
if (!flash->erase) {
fprintf(stderr, "Error: flashrom has no erase function for this flash chip.\n");
return 1;
}
flash->erase(flash);
exit(0);
} else if (read_it) {
@ -493,8 +502,13 @@ int main(int argc, char *argv[])
// ////////////////////////////////////////////////////////////
if (write_it)
if (write_it) {
if (!flash->write) {
fprintf(stderr, "Error: flashrom has no write function for this flash chip.\n");
return 1;
}
ret |= flash->write(flash, buf);
}
if (verify_it)
ret |= verify_flash(flash, buf);