Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 910bbfa9 authored by Colin Cross's avatar Colin Cross Committed by Android Git Automerger
Browse files

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

* commit '85605900':
  fastboot: move help command before usb connect
parents 011cae80 85605900

fastboot/fastboot.c

+5 −3
Original line number Diff line number Diff line
@@ -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;