| Index: cli_classic.c
|
| diff --git a/cli_classic.c b/cli_classic.c
|
| index 0c6ffac26e48c2f2015add4af076753bc2f84c3a..3ca4453c2a468809317ea88c29ba330b65e89f4d 100644
|
| --- a/cli_classic.c
|
| +++ b/cli_classic.c
|
| @@ -374,7 +374,7 @@ int cli_classic(int argc, char *argv[])
|
| for (i = 0; i < ARRAY_SIZE(flashes) && flashes[i]; i++)
|
| printf(" %s", flashes[i]->name);
|
| printf("\nPlease specify which chip to use with the -c <chipname> option.\n");
|
| - programmer_shutdown();
|
| + flashrom_shutdown();
|
| exit(1);
|
| } else if (!flashes[0]) {
|
| printf("No EEPROM/flash device found.\n");
|
| @@ -386,14 +386,14 @@ int cli_classic(int argc, char *argv[])
|
| flashes[0] = probe_flash(flashchips, 1);
|
| if (!flashes[0]) {
|
| printf("Probing for flash chip '%s' failed.\n", chip_to_probe);
|
| - programmer_shutdown();
|
| + flashrom_shutdown();
|
| exit(1);
|
| }
|
| printf("Please note that forced reads most likely contain garbage.\n");
|
| return read_flash_to_file(flashes[0], filename);
|
| }
|
| // FIXME: flash writes stay enabled!
|
| - programmer_shutdown();
|
| + flashrom_shutdown();
|
| exit(1);
|
| }
|
|
|
| @@ -406,21 +406,21 @@ int cli_classic(int argc, char *argv[])
|
| (!force)) {
|
| fprintf(stderr, "Chip is too big for this programmer "
|
| "(-V gives details). Use --force to override.\n");
|
| - programmer_shutdown();
|
| + flashrom_shutdown();
|
| return 1;
|
| }
|
|
|
| if (!(read_it | write_it | verify_it | erase_it)) {
|
| printf("No operations were specified.\n");
|
| // FIXME: flash writes stay enabled!
|
| - programmer_shutdown();
|
| + flashrom_shutdown();
|
| exit(0);
|
| }
|
|
|
| if (!filename && !erase_it) {
|
| printf("Error: No filename specified.\n");
|
| // FIXME: flash writes stay enabled!
|
| - programmer_shutdown();
|
| + flashrom_shutdown();
|
| exit(1);
|
| }
|
|
|
|
|