Skip to content
Browse files

Merge "fastboot: move help command before usb connect"

  • Loading branch information...
2 parents 82959f5 + 80f9867 commit 922b460cc790722ffc303b200f02958e4066a2de @colincross colincross committed with android code review Sep 10, 2012
Showing with 5 additions and 3 deletions.
  1. +5 −3 fastboot/fastboot.c
View
8 fastboot/fastboot.c
@@ -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;

0 comments on commit 922b460

Please sign in to comment.
Something went wrong with that request. Please try again.