commit 16fe8205d5bf5ac035f44107814d32d010e25a79
author Yavor Goulishev <yavor@google.com> Mon Oct 15 09:23:22 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 15 09:23:23 2012 -0700
tree b2a556e25f3c8f2e36d5a409ea617d977cccc885
parent 6f4f49e45fea0e15537701a6fbd0c43f2bdbec32
parent 94f75d37846126467bed773d937307efb49289b1

Merge "Added the Samsung Galaxy family VID and PID."

src/libusb-glue.c

diff --git a/src/libusb-glue.c b/src/libusb-glue.c
index a6f1a78..cdddfca 100644
--- a/src/libusb-glue.c
+++ b/src/libusb-glue.c
@@ -54,6 +54,8 @@
 #define USB_CLASS_MISC 0xEF
 #endif
 
+#define APPLE_VID 0x05ac
+
 /* To enable debug prints for USB stuff, switch on this */
 //#define ENABLE_USB_BULK_DEBUG
 
@@ -229,10 +231,10 @@
    * you find some weird combination...
    */
   if (!(dev->descriptor.bDeviceClass == USB_CLASS_PER_INTERFACE ||
-	dev->descriptor.bDeviceClass == USB_CLASS_COMM ||
-	dev->descriptor.bDeviceClass == USB_CLASS_PTP ||
-	dev->descriptor.bDeviceClass == USB_CLASS_VENDOR_SPEC ||
-	dev->descriptor.bDeviceClass == USB_CLASS_MISC)) {
+	    dev->descriptor.bDeviceClass == USB_CLASS_PTP ||
+	    dev->descriptor.bDeviceClass == USB_CLASS_VENDOR_SPEC) ||
+      /* Apple devices sometimes freeze when probed by libusb */
+      dev->descriptor.idVendor == APPLE_VID) {
     return 0;
   }