A patch: fixed mistaken libusbhid change

[Andrew Thompson]

On Fri, Feb 27, 2009 at 03:11:24PM +0900, Daichi GOTO wrote:
> Hi USB2 folks,
> 
> I have found libusbhid has been changed with
> mistaken patch. I have made a fix patch included.
> Please check that, consider and merge and commit!

Committed, thanks.

> --- lib/libusbhid/descr.c.orig	2009-02-24 03:36:54.000000000 +0900
> +++ lib/libusbhid/descr.c	2009-02-27 14:55:50.000000000 +0900
> @@ -85,13 +85,15 @@
>  	/* get actual length first */
>  	ugd.ugd_data = NULL;
>  	ugd.ugd_maxlen = 65535;
> -#ifdef HID_COMPAT7
>  	if (ioctl(fd, USB_GET_REPORT_DESC, &ugd) < 0) {
> +#ifdef HID_COMPAT7
>  		/* could not read descriptor */
>  		/* try FreeBSD 7 compat code */
>  		return (hid_get_report_desc_compat7(fd));
> -	}
> +#else
> +		return (NULL);
>  #endif
> +	}
>  
>  	/*
>  	 * NOTE: The kernel will return a failure if 

> _______________________________________________
> freebsd-current at freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe at freebsd.org"