commit a65d62bce3f25d988e86a3af421b6aefc5638a22
author Colin Cross <ccross@android.com> Mon Sep 10 14:12:43 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Sep 10 14:12:43 2012 -0700
tree 36453f0adf99bf63e0a8077433e2318635caf55a
parent 33d1cc72d1fc655654a075818191ed320093d985
parent ae807aaa022196b2f08f64f303b380c1903b77e0

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

* commit 'ae807aaa022196b2f08f64f303b380c1903b77e0':
  fastboot: move help command before usb connect

fastboot/fastboot.c

diff --git a/fastboot/fastboot.c b/fastboot/fastboot.c
index 898d452..06a6a13 100644
--- a/fastboot/fastboot.c
+++ b/fastboot/fastboot.c
@@ -850,6 +850,11 @@
         return 0;
     }
 
+    if (argc > 0 && !strcmp(*argv, "help")) {
+        usage();
+        return 0;
+    }
+
     usb = open_device();
 
     while (argc > 0) {
@@ -940,9 +945,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;