am eb7ee9c0: am 922b460c: Merge "fastboot: move help command before usb connect"

* commit 'eb7ee9c0c513160d8db5c76a82f56ed966ec41c0':
  fastboot: move help command before usb connect
This commit is contained in:
Colin Cross 2012-09-10 14:45:43 -07:00 committed by Android Git Automerger
commit e6b898106c
1 changed files with 5 additions and 3 deletions

View File

@ -832,6 +832,11 @@ int main(int argc, char **argv)
return 0;
}
if (argc > 0 && !strcmp(*argv, "help")) {
usage();
return 0;
}
usb = open_device();
while (argc > 0) {
@ -922,9 +927,6 @@ int main(int argc, char **argv)
wants_reboot = 1;
} else if(!strcmp(*argv, "oem")) {
argc = do_oem_command(argc, argv);
} else if (!strcmp(*argv, "help")) {
usage();
return 0;
} else {
usage();
return 1;