[gphoto-cvs] SF.net SVN: gphoto:[13874] trunk/libgphoto2/libgphoto2_port/libusb1/libusb1 .c

[<mar...@us...>]

Revision: 13874
          http://gphoto.svn.sourceforge.net/gphoto/?rev=13874&view=rev
Author:   marcusmeissner
Date:     2012-02-22 19:38:20 +0000 (Wed, 22 Feb 2012)
Log Message:
-----------
attached driver 0 == none, free device lists

Modified Paths:
--------------
    trunk/libgphoto2/libgphoto2_port/libusb1/libusb1.c

Modified: trunk/libgphoto2/libgphoto2_port/libusb1/libusb1.c
===================================================================
--- trunk/libgphoto2/libgphoto2_port/libusb1/libusb1.c	2012-02-22 19:36:12 UTC (rev 13873)
+++ trunk/libgphoto2/libgphoto2_port/libusb1/libusb1.c	2012-02-22 19:38:20 UTC (rev 13874)
@@ -79,10 +79,8 @@
 	return (GP_PORT_USB);
 }
 
-/* FIXME: timeout this cached information */
 static time_t gp_devslastchecked = 0;
 static int gp_nrofdevs = 0;
-
 static struct libusb_device_descriptor	*gp_descs;
 static libusb_device			**gp_devs;
 
@@ -93,7 +91,7 @@
 	time(&xtime);
 	if (xtime != gp_devslastchecked) {
 		if (gp_nrofdevs)
-			libusb_free_device_list (gp_devs, 0);
+			libusb_free_device_list (gp_devs, 1);
 		free (gp_descs);
 		gp_nrofdevs = 0;
 		gp_devs = NULL;
@@ -275,7 +273,8 @@
 		free (port->pl);
 		port->pl = NULL;
 	}
-
+	if (gp_devs) libusb_free_device_list (gp_devs, 1);
+	free (gp_descs);
 	return (GP_OK);
 }
 
@@ -309,14 +308,16 @@
 	}
 #endif
 
-	if (ret >= 0) {
-		gp_log (GP_LOG_DEBUG,"libusb1",_("Device has a kernel driver attached (%d), detaching it now."), ret);
+	switch (ret) {
+	case 1: gp_log (GP_LOG_DEBUG,"libusb1",_("Device has a kernel driver attached (%d), detaching it now."), ret);
 		ret = libusb_detach_kernel_driver (port->pl->dh, port->settings.usb.interface);
 		if (ret < 0)
 			gp_port_set_error (port, _("Could not detach kernel driver of camera device."));
 		else
 			port->pl->detached = 1;
-	} else {
+	case 0:	/* not detached */
+		break;
+	default:
 		if (errno != ENODATA) /* ENODATA - just no driver there */
 			gp_port_set_error (port, _("Could not query kernel driver of device."));
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.