summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcus Meissner <marcus@jet.franken.de>2012-08-01 15:01:41 +0000
committerMarcus Meissner <marcus@jet.franken.de>2012-08-01 15:01:41 +0000
commit6231bb7d1e3a0e07dd1fa0423a90795acbb13f69 (patch)
treea9dcf233dffefa5aec1e19c5f6927a59261e7d07
parent3bbcaf73c0deac92b723dac87bbfa54796e29392 (diff)
downloadlibgphoto2-6231bb7d1e3a0e07dd1fa0423a90795acbb13f69.tar.gz
devicelist is actually freed by above libusb_exit already
git-svn-id: https://svn.code.sf.net/p/gphoto/code/branches/libgphoto2-2_4/libgphoto2@14079 67ed7778-7388-44ab-90cf-0a291f65f57c
-rw-r--r--libgphoto2_port/libusb1/libusb1.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libgphoto2_port/libusb1/libusb1.c b/libgphoto2_port/libusb1/libusb1.c
index 83d25ef4d..822165c3d 100644
--- a/libgphoto2_port/libusb1/libusb1.c
+++ b/libgphoto2_port/libusb1/libusb1.c
@@ -275,8 +275,9 @@ gp_port_usb_exit (GPPort *port)
free (port->pl);
port->pl = NULL;
}
- if (gp_devs) libusb_free_device_list (gp_devs, 1);
- gp_devs = NULL; gp_nrofdevs = 0;
+ /* gp_devs was freed by libusb_exit! */
+ gp_devs = NULL;
+ gp_nrofdevs = 0;
free (gp_descs);
return (GP_OK);
}