34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
|
From 9e516b92147fe6abbfe8c8eca593fb98e542e297 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Marcus Meissner <meissner@novell.com>
|
||
|
|
Date: Tue, 25 Jan 2011 16:05:02 +0100
|
||
|
|
Subject: [PATCH] do not match PTP generic interface
|
||
|
|
|
||
|
|
---
|
||
|
|
src/libusb-glue.c | 3 +++
|
||
|
|
1 files changed, 3 insertions(+), 0 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/libusb-glue.c b/src/libusb-glue.c
|
||
|
|
index ea22384..e7fee3d 100644
|
||
|
|
--- a/src/libusb-glue.c
|
||
|
|
+++ b/src/libusb-glue.c
|
||
|
|
@@ -269,6 +269,8 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
|
||
|
|
struct usb_interface_descriptor *intf =
|
||
|
|
&dev->config[i].interface[j].altsetting[k];
|
||
|
|
|
||
|
|
+#if 0
|
||
|
|
+ /* This detects _all_ PTP cameras and marks them as MTP devices. Not good. -Marcus */
|
||
|
|
/*
|
||
|
|
* Check for Still Image Capture class with PIMA 15740 protocol,
|
||
|
|
* also known as PTP
|
||
|
|
@@ -284,6 +286,7 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile)
|
||
|
|
usb_close(devh);
|
||
|
|
return 1;
|
||
|
|
}
|
||
|
|
+#endif
|
||
|
|
buf[0] = '\0';
|
||
|
|
ret = usb_get_string_simple(devh,
|
||
|
|
dev->config[i].interface[j].altsetting[k].iInterface,
|
||
|
|
--
|
||
|
|
1.7.3.4
|
||
|
|
|