From 852c53d4ac24b29d74b36ce1ad7d527b89caae97 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Mon, 17 Aug 2009 04:15:08 +0000 Subject: [PATCH] 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 --- ChangeLog | 5 +++++ NEWS | 1 + usb_libusb.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 779db228..ce131ac9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-08-17 Joerg Wunsch + + * usb_libusb.c (usbdev_close): Repair the logic around the + conditional compilation of usb_reset() introduced in r798. + 2009-07-11 Joerg Wunsch * configure.ac: We are post-5.8 now. diff --git a/NEWS b/NEWS index e3affaed..76874b9c 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,7 @@ Current: * New programmers supported: + * Bugfixes Version 5.8: diff --git a/usb_libusb.c b/usb_libusb.c index 770a75d9..5b404b73 100644 --- 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