diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2007-08-16 05:40:35 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2007-08-16 05:40:35 +0000 |
| commit | 70e3bb10989168294e1445ca7e695dec55bbc613 (patch) | |
| tree | b154bd9180765d3cf093b69fc012946619a0bcd6 /libgphoto2_port/usb | |
| parent | 57d8e4d91c324371d5e86573a76f458e666b2002 (diff) | |
| download | libgphoto2-70e3bb10989168294e1445ca7e695dec55bbc613.tar.gz | |
usb_reset is too dangerous for EOS cameras.
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@10595 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'libgphoto2_port/usb')
| -rw-r--r-- | libgphoto2_port/usb/libusb.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index 6473b2319..d39ed19d9 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -290,6 +290,8 @@ gp_port_usb_close (GPPort *port) return (GP_ERROR_IO); } +#if 0 + /* This confuses the EOS 5d camera and possible other EOSs. *sigh* */ /* This is only for our very special Canon cameras which need a good * whack after close, otherwise they get timeouts on reconnect. */ @@ -299,7 +301,7 @@ gp_port_usb_close (GPPort *port) return (GP_ERROR_IO); } } - +#endif if (usb_close (port->pl->dh) < 0) { gp_port_set_error (port, _("Could not close USB port (%m).")); return (GP_ERROR_IO); |