diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2012-03-26 19:34:33 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2012-03-26 19:34:33 +0000 |
| commit | f6536a5fefe615d9944fe8c204862b6bfd291649 (patch) | |
| tree | 533873cc9a81ea896e41637ff684d3d1ed909edf | |
| parent | e211e820f585a14bd2810028ec73bc6983ba4a46 (diff) | |
| download | libgphoto2-f6536a5fefe615d9944fe8c204862b6bfd291649.tar.gz | |
do not cache it too early
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@13950 67ed7778-7388-44ab-90cf-0a291f65f57c
| -rw-r--r-- | libgphoto2_port/libusb1/libusb1.c | 2 | ||||
| -rw-r--r-- | libgphoto2_port/usb/libusb.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libgphoto2_port/libusb1/libusb1.c b/libgphoto2_port/libusb1/libusb1.c index 55cd670bf..c6b16aa91 100644 --- a/libgphoto2_port/libusb1/libusb1.c +++ b/libgphoto2_port/libusb1/libusb1.c @@ -567,9 +567,11 @@ gp_port_usb_update (GPPort *port) port->settings_pending.usb.altsetting ); +/* do not set it here, otherwise stv680 doesnt work if (port->pl->interface == -1) port->pl->interface = port->settings.usb.interface; if (port->pl->config == -1) port->pl->config = port->settings.usb.config; if (port->pl->altsetting == -1) port->pl->altsetting = port->settings.usb.altsetting; +*/ /* The portname can also be changed with the device still fully closed. */ memcpy(&port->settings.usb.port, &port->settings_pending.usb.port, diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index 1c44cc8b4..ebc07d70d 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -530,9 +530,11 @@ gp_port_usb_update (GPPort *port) if (!port) return GP_ERROR_BAD_PARAMETERS; +#if 0 if (port->pl->interface == -1) port->pl->interface = port->settings.usb.interface; if (port->pl->config == -1) port->pl->config = port->settings.usb.config; if (port->pl->altsetting == -1) port->pl->altsetting = port->settings.usb.altsetting; +#endif /* The portname can also be changed with the device still fully closed. */ memcpy(&port->settings.usb.port, &port->settings_pending.usb.port, |