diff options
| author | Marcus Meissner <marcus@jet.franken.de> | 2013-09-01 17:42:48 +0000 |
|---|---|---|
| committer | Marcus Meissner <marcus@jet.franken.de> | 2013-09-01 17:42:48 +0000 |
| commit | 13c1bebcd6836d24ca6367a9d871e6bd193b7789 (patch) | |
| tree | 17436bf2f3c5b00f34f9b661e1bab8f9068dd24c /camlibs/canon | |
| parent | 1c8dae9e95033a8714d52d70c3735de9c9836b34 (diff) | |
| download | libgphoto2-13c1bebcd6836d24ca6367a9d871e6bd193b7789.tar.gz | |
also remove the clear halt calls here, to avoid hangs
on raspberry and usb 3
git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@14538 67ed7778-7388-44ab-90cf-0a291f65f57c
Diffstat (limited to 'camlibs/canon')
| -rw-r--r-- | camlibs/canon/usb.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/camlibs/canon/usb.c b/camlibs/canon/usb.c index b4ddff003..bddea06b0 100644 --- a/camlibs/canon/usb.c +++ b/camlibs/canon/usb.c @@ -472,12 +472,14 @@ canon_usb_init (Camera *camera, GPContext *context) GP_DEBUG ("Initializing the (USB) camera."); - /* FIXME: check these ... they seem necessary actually, but might - * cause issues on USB 3 or RaspBerry Pi */ +#if 0 + /* FIXME: as raspberry user confirmed the need for those... + * I am currently not sure why I added them. + */ gp_port_usb_clear_halt (camera->port, GP_PORT_USB_ENDPOINT_IN); gp_port_usb_clear_halt (camera->port, GP_PORT_USB_ENDPOINT_OUT); gp_port_usb_clear_halt (camera->port, GP_PORT_USB_ENDPOINT_INT); - +#endif camstat = canon_usb_camera_init (camera, context); if ( camstat < 0 ) return camstat; |