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

Commit 35e6a003 authored by Omari Stephens's avatar Omari Stephens Committed by Android (Google) Code Review
Browse files

Merge "Add a 1000msec timeout for adb's USB control packets"

parents ef1e9bf9 8bbae239

adb/usb_linux.c

+2 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ static void register_device(const char *dev_name, 
        ctrl.wIndex = 0;

        ctrl.wLength = sizeof(languages);

        ctrl.data = languages;

        ctrl.timeout = 1000;



        result = ioctl(usb->desc, USBDEVFS_CONTROL, &ctrl);

        if (result > 0)
@@ -620,6 +621,7 @@ static void register_device(const char *dev_name, 
            ctrl.wIndex = __le16_to_cpu(languages[i]);

            ctrl.wLength = sizeof(buffer);

            ctrl.data = buffer;

            ctrl.timeout = 1000;



            result = ioctl(usb->desc, USBDEVFS_CONTROL, &ctrl);

            if (result > 0) {