From f481ce2afd6dee43358aaa50ed4ae4ea23e8d36e Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 16 Feb 2005 14:44:01 +0000 Subject: [PATCH] * deactivate usb-storage driver if we get here. git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@7600 67ed7778-7388-44ab-90cf-0a291f65f57c --- libgphoto2_port/usb/libusb.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c index 3d01f436d..5dd5c2fed 100644 --- a/libgphoto2_port/usb/libusb.c +++ b/libgphoto2_port/usb/libusb.c @@ -196,11 +196,7 @@ gp_port_usb_open (GPPort *port) gp_port_set_error (port, _("Camera is already in use.")); return GP_ERROR_IO_LOCK; } - if (strstr(name,"storage")) { - /* other gphoto instance most likely */ - gp_port_set_error (port, _("Camera is supported by USB Storage driver.")); - return GP_ERROR_NOT_SUPPORTED; - } + if (ret >= 0) { gp_log (GP_LOG_DEBUG,"libusb",_("Device has driver '%s' attached, detaching it now."), name); ret = usb_detach_kernel_driver_np (port->pl->dh, port->settings.usb.interface);