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

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

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

* commit 'eb7ee9c0':
  fastboot: move help command before usb connect
parents 6de26787 eb7ee9c0

fastboot/fastboot.c

+5 −3
Original line number Original line Diff line number Diff line
@@ -832,6 +832,11 @@ int main(int argc, char **argv) 
        return 0;

        return 0;

    }

    }





    if (argc > 0 && !strcmp(*argv, "help")) {

        usage();

        return 0;

    }



    usb = open_device();

    usb = open_device();





    while (argc > 0) {

    while (argc > 0) {
@@ -922,9 +927,6 @@ int main(int argc, char **argv) 
            wants_reboot = 1;

            wants_reboot = 1;

        } else if(!strcmp(*argv, "oem")) {

        } else if(!strcmp(*argv, "oem")) {

            argc = do_oem_command(argc, argv);

            argc = do_oem_command(argc, argv);

        } else if (!strcmp(*argv, "help")) {

            usage();

            return 0;

        } else {

        } else {

            usage();

            usage();

            return 1;

            return 1;