diff options
author | Marcus Meissner <marcus@jet.franken.de> | 2015-03-10 09:08:36 +0000 |
---|---|---|
committer | Marcus Meissner <marcus@jet.franken.de> | 2015-03-10 09:08:36 +0000 |
commit | 03faa36664479a4bbc12f385f163416409dafb13 (patch) | |
tree | 18f22771833082cc34b1952a39ede2b760e1882d /libgphoto2_port/libusb1 | |
parent | b9d27577c341a8a091b94aa423cc6c3731aec7d8 (diff) | |
download | libgphoto2-03faa36664479a4bbc12f385f163416409dafb13.tar.gz |
return the read bytes from a control transfer, we need it
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@15384 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/libusb1')
-rw-r--r-- | libgphoto2_port/libusb1/libusb1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libgphoto2_port/libusb1/libusb1.c b/libgphoto2_port/libusb1/libusb1.c index 13737374f..2ee810c51 100644 --- a/libgphoto2_port/libusb1/libusb1.c +++ b/libgphoto2_port/libusb1/libusb1.c @@ -563,13 +563,14 @@ gp_libusb1_check_int (GPPort *port, char *bytes, int size, int timeout) static int gp_libusb1_msg(GPPort *port, int request, int value, int index, char *bytes, int size, int flags, int default_error) { + int handled = 0; C_PARAMS (port && port->pl->dh); - C_LIBUSB (libusb_control_transfer (port->pl->dh, flags, request, value, index, + C_LIBUSB (handled = libusb_control_transfer (port->pl->dh, flags, request, value, index, (unsigned char*)bytes, size, port->timeout), default_error); - return GP_OK; + return handled; } static int |