summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2020-10-21 13:32:29 +0200
committerMarcus Meissner <marcus@jet.franken.de>2020-10-21 13:32:29 +0200
commit8fab31d154a7c8025d8c84c1ffc65b36a1e8c74c (patch)
treec0b6e0d9be7397fc98e66239b98cdcdbaafc190f
parent9c39923e0e1861b3a7a1b9712f5a3e7578d7a8e7 (diff)
parentf28093779e7c71263800ac2310aa07b40043c778 (diff)
downloadlibmtp-8fab31d154a7c8025d8c84c1ffc65b36a1e8c74c.tar.gz
Merge remote-tracking branch 'github/master' into master
-rw-r--r--src/libusb-glue.c2
-rw-r--r--src/libusb1-glue.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libusb-glue.c b/src/libusb-glue.c
index 5e84b1d..3c1b023 100644
--- a/src/libusb-glue.c
+++ b/src/libusb-glue.c
@@ -1645,7 +1645,7 @@ ptp_usb_control_cancel_request (PTPParams *params, uint32_t transactionid) {
(char *) buffer,
sizeof(buffer),
ptp_usb->timeout);
- if (ret < sizeof(buffer))
+ if (ret < (int)sizeof(buffer))
return PTP_ERROR_IO;
return PTP_RC_OK;
}
diff --git a/src/libusb1-glue.c b/src/libusb1-glue.c
index 6ba3eb7..9cc4781 100644
--- a/src/libusb1-glue.c
+++ b/src/libusb1-glue.c
@@ -1852,7 +1852,7 @@ ptp_usb_control_cancel_request (PTPParams *params, uint32_t transactionid) {
buffer,
sizeof(buffer),
ptp_usb->timeout);
- if (ret < sizeof(buffer))
+ if (ret < (int)sizeof(buffer))
return PTP_ERROR_IO;
return PTP_RC_OK;
}
@@ -1874,7 +1874,7 @@ ptp_usb_control_device_status_request (PTPParams *params) {
buffer,
sizeof(buffer),
ptp_usb->timeout);
- if (ret < sizeof(buffer))
+ if (ret < (int)sizeof(buffer))
return PTP_ERROR_IO;
ret = dtoh16a(&buffer[2]);