From db6d9731fd8d1bb531e536c0098bbc1060f5bc69 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Sat, 20 Jan 2007 20:32:01 +0000 Subject: [PATCH] use usb_interrupt_read instead of usb_bulk_read. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@9917 67ed7778-7388-44ab-90cf-0a291f65f57c --- libgphoto2_port/ChangeLog | 5 +++++ libgphoto2_port/usb/libusb.c | 3 +-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libgphoto2_port/ChangeLog b/libgphoto2_port/ChangeLog index 86638ce5d..ede765815 100644 --- a/libgphoto2_port/ChangeLog +++ b/libgphoto2_port/ChangeLog @@ -1,3 +1,8 @@ +2007-01-20 Marcus Meissner + + * usb/libusb.c: Use usb_interrupt_read instead + of usb_bulk_read. + 2006-09-09 Marcus Meissner * disk: Merged Solaris mount entry handling from diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index 5dabad8d9..544a0cfb1 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -267,7 +267,6 @@ gp_port_usb_open (GPPort *port) port->settings.usb.interface, "sdc2xx, stv680, spca50x"); return GP_ERROR_IO_USB_CLAIM; } - return GP_OK; } @@ -361,7 +360,7 @@ gp_port_usb_check_int (GPPort *port, char *bytes, int size, int timeout) if (!port || !port->pl->dh || timeout < 0) return GP_ERROR_BAD_PARAMETERS; - ret = usb_bulk_read(port->pl->dh, port->settings.usb.intep, + ret = usb_interrupt_read(port->pl->dh, port->settings.usb.intep, bytes, size, timeout); if (ret < 0) return GP_ERROR_IO_READ;