usbdev_close(): Repair the logic around the

conditional compilation of usb_reset() introduced in r798. git-svn-id: svn://svn.savannah.nongnu.org/avrdude/trunk/avrdude@841 81a1dc3b-b13d-400b-aceb-764788c761c2
2009-08-17 04:15:08 +00:00 · 2009-08-17 04:15:08 +00:00 · 852c53d4ac
parent 44c376b282
commit 852c53d4ac
3 changed files with 7 additions and 1 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+2009-08-17  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	* usb_libusb.c (usbdev_close): Repair the logic around the
+	conditional compilation of usb_reset() introduced in r798.
+
 2009-07-11  Joerg Wunsch <j.gnu@uriah.heep.sax.de>

 	* configure.ac: We are post-5.8 now.
--- a/1
+++ b/1
@ -11,6 +11,7 @@ Current:

  * New programmers supported:

+  * Bugfixes

 Version 5.8:

--- a/usb_libusb.c
+++ b/usb_libusb.c
@ -239,7 +239,7 @@ static void usbdev_close(union filedescriptor *fd)

  (void)usb_release_interface(udev, usb_interface);

-#if defined(__FreeBSD__)
+#if !defined(__FreeBSD__)
  /*
   * Without this reset, the AVRISP mkII seems to stall the second
   * time we try to connect to it.  This is not necessary on