commit 922b460cc790722ffc303b200f02958e4066a2de
author Colin Cross <ccross@android.com> Mon Sep 10 14:13:29 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Mon Sep 10 14:13:29 2012 -0700
tree 13f3be854380ef73c7305b08c98cdadcb4fb8441
parent 82959f5e46870cb57675d1ebba97294c56508949
parent 80f9867431af4632749890b24c0256f0ab07640d

Merge "fastboot: move help command before usb connect"

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index b6eab8c..c9def7b 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -832,6 +832,11 @@
         return 0;
     }
 
+    if (argc > 0 && !strcmp(*argv, "help")) {
+        usage();
+        return 0;
+    }
+
     usb = open_device();
 
     while (argc > 0) {
@@ -922,9 +927,6 @@
             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;