diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2018-08-09 07:40:21 +0200 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2018-08-09 07:40:21 +0200 |
| commit | 79ac9602498eec27f35b2376150b36fc00f29376 (patch) | |
| tree | 8748ca9e6c906c08d196d659d40253b60ec993e0 | |
| parent | 7d1f80bb3e33b22c628afcda2a77eebf1caa91d4 (diff) | |
| parent | 741b243d931f4b3c0514b8020120ce9ac8d5072c (diff) | |
| download | libmtp-79ac9602498eec27f35b2376150b36fc00f29376.tar.gz | |
Merge remote-tracking branch 'github/master'
| -rw-r--r-- | src/libopenusb1-glue.c | 6 | ||||
| -rw-r--r-- | src/libusb-glue.c | 2 | ||||
| -rw-r--r-- | src/libusb1-glue.c | 2 | ||||
| -rw-r--r-- | src/util.c | 1 |
4 files changed, 5 insertions, 6 deletions
diff --git a/src/libopenusb1-glue.c b/src/libopenusb1-glue.c index 84cfb6b..5d0875e 100644 --- a/src/libopenusb1-glue.c +++ b/src/libopenusb1-glue.c @@ -500,7 +500,7 @@ static LIBMTP_error_number_t get_mtp_usb_device_list(mtpdevice_list_t ** mtp_dev ret = openusb_parse_device_desc(libmtp_openusb_handle, dev, NULL, 0, &desc); if (ret != OPENUSB_SUCCESS) continue; - + if (desc.bDeviceClass != USB_CLASS_HUB) { int i; int found = 0; @@ -651,7 +651,7 @@ LIBMTP_error_number_t LIBMTP_Detect_Raw_Devices(LIBMTP_raw_device_t ** devices, retdevs[i].device_entry.device_flags = mtp_device_table[j].device_flags; // This device is known to the developers - LIBMTP_ERROR("Device %d (VID=%04x and PID=%04x) is a %s %s.\n", + LIBMTP_INFO("Device %d (VID=%04x and PID=%04x) is a %s %s.\n", i, desc.idVendor, desc.idProduct, @@ -1239,7 +1239,7 @@ ptp_usb_senddata(PTPParams* params, PTPContainer* ptp, if (ret != PTP_RC_OK){ return ret; } - + if (gotlen != datawlen){ return PTP_RC_GeneralError; } diff --git a/src/libusb-glue.c b/src/libusb-glue.c index 9e20119..7b76b88 100644 --- a/src/libusb-glue.c +++ b/src/libusb-glue.c @@ -666,7 +666,7 @@ LIBMTP_error_number_t LIBMTP_Detect_Raw_Devices(LIBMTP_raw_device_t ** devices, retdevs[i].device_entry.device_flags = mtp_device_table[j].device_flags; // This device is known to the developers - LIBMTP_ERROR("Device %d (VID=%04x and PID=%04x) is a %s %s.\n", + LIBMTP_INFO("Device %d (VID=%04x and PID=%04x) is a %s %s.\n", i, dev->libusb_device->descriptor.idVendor, dev->libusb_device->descriptor.idProduct, diff --git a/src/libusb1-glue.c b/src/libusb1-glue.c index 6c88a24..636c544 100644 --- a/src/libusb1-glue.c +++ b/src/libusb1-glue.c @@ -690,7 +690,7 @@ LIBMTP_error_number_t LIBMTP_Detect_Raw_Devices(LIBMTP_raw_device_t ** devices, retdevs[i].device_entry.device_flags = mtp_device_table[j].device_flags; // This device is known to the developers - LIBMTP_ERROR("Device %d (VID=%04x and PID=%04x) is a %s %s.\n", + LIBMTP_INFO("Device %d (VID=%04x and PID=%04x) is a %s %s.\n", i, desc.idVendor, desc.idProduct, @@ -149,4 +149,3 @@ char *strndup (const char *s, size_t n) return ret; } #endif - |