Date: Fri, 27 Feb 2009 07:31:13 -0800 From: Andrew Thompson <thompsa@FreeBSD.org> To: Daichi GOTO <daichi@ongs.co.jp> Cc: FreeBSD Current <freebsd-current@freebsd.org>, Masanori OZAWA <ozawa@ongs.co.jp>, Hans Petter Selasky <hselasky@c2i.net> Subject: Re: A patch: fixed mistaken libusbhid change Message-ID: <20090227153113.GC53460@citylink.fud.org.nz> In-Reply-To: <49A7840C.4020902@ongs.co.jp> References: <49A7840C.4020902@ongs.co.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
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@freebsd.org mailing list
> http://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090227153113.GC53460>