summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2020-10-19 15:31:41 +0200
committerGitHub <noreply@github.com>2020-10-19 15:31:41 +0200
commitf28093779e7c71263800ac2310aa07b40043c778 (patch)
tree49dd50795341c8ebda9e3041ba0cad1e35b52389
parent55d4b179dc69c11430373c7de0aebc9759901927 (diff)
parent56711c7ff5c406c51238148638ff3fa1906ac1b6 (diff)
downloadlibmtp-f28093779e7c71263800ac2310aa07b40043c778.tar.gz
Merge pull request #56 from arturmadrzak/patch-1
Bugfix for return value in cancel and status request
-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]);