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

* commit '922b460cc790722ffc303b200f02958e4066a2de':
  fastboot: move help command before usb connect
This commit is contained in:
Colin Cross 2012-09-10 14:43:26 -07:00 committed by Android Git Automerger
commit eb7ee9c0c5

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;