am ae807aaa: Merge "fastboot: move help command before usb connect" into jb-mr1-dev

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

View File

@ -850,6 +850,11 @@ int main(int argc, char **argv)
return 0;
}
if (argc > 0 && !strcmp(*argv, "help")) {
usage();
return 0;
}
usb = open_device();
while (argc > 0) {
@ -940,9 +945,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;