diff options
| author | Elliott Hughes <enh@google.com> | 2017-01-26 21:39:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-01-26 21:39:39 +0000 |
| commit | fc267f865e1475030f777a3640bd1cf46dc766b0 (patch) | |
| tree | 6cd2674a339d58b47ba1b92c97bc6762bfedb37f | |
| parent | b3d294dd8fd49badb108f29fc29d05055a80b776 (diff) | |
| parent | d23afb598093c2b2c78c909d5894b63dffdc094c (diff) | |
| download | core-fc267f865e1475030f777a3640bd1cf46dc766b0.tar.gz core-fc267f865e1475030f777a3640bd1cf46dc766b0.tar.bz2 core-fc267f865e1475030f777a3640bd1cf46dc766b0.zip | |
Merge "fastboot: Workaround for touchbar hang on MBP 2016"
| -rw-r--r-- | fastboot/usb_osx.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/fastboot/usb_osx.cpp b/fastboot/usb_osx.cpp index ee5d57530..032ae3187 100644 --- a/fastboot/usb_osx.cpp +++ b/fastboot/usb_osx.cpp @@ -92,7 +92,6 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { HRESULT result; SInt32 score; UInt8 interfaceNumEndpoints; - UInt8 configuration; // Placing the constant KIOUSBFindInterfaceDontCare into the following // fields of the IOUSBFindInterfaceRequest structure will allow us to @@ -102,13 +101,6 @@ static int try_interfaces(IOUSBDeviceInterface182 **dev, usb_handle *handle) { request.bInterfaceProtocol = kIOUSBFindInterfaceDontCare; request.bAlternateSetting = kIOUSBFindInterfaceDontCare; - // SetConfiguration will kill an existing UMS connection, so let's - // not do this if not necessary. - configuration = 0; - (*dev)->GetConfiguration(dev, &configuration); - if (configuration != 1) - (*dev)->SetConfiguration(dev, 1); - // Get an iterator for the interfaces on the device kr = (*dev)->CreateInterfaceIterator(dev, &request, &iterator); |