From owner-freebsd-current@FreeBSD.ORG  Fri Feb 27 15:31:18 2009
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 77F8F1065695
	for <freebsd-current@freebsd.org>; Fri, 27 Feb 2009 15:31:18 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from pele.citylink.co.nz (pele.citylink.co.nz [202.8.44.226])
	by mx1.freebsd.org (Postfix) with ESMTP id 3A8488FC12
	for <freebsd-current@freebsd.org>; Fri, 27 Feb 2009 15:31:18 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from localhost (localhost [127.0.0.1])
	by pele.citylink.co.nz (Postfix) with ESMTP id 68392FF83;
	Sat, 28 Feb 2009 04:31:17 +1300 (NZDT)
X-Virus-Scanned: Debian amavisd-new at citylink.co.nz
Received: from pele.citylink.co.nz ([127.0.0.1])
	by localhost (pele.citylink.co.nz [127.0.0.1]) (amavisd-new, port 10024)
	with ESMTP id 9Ii0xRv5NIVN; Sat, 28 Feb 2009 04:31:13 +1300 (NZDT)
Received: from citylink.fud.org.nz (unknown [202.8.44.45])
	by pele.citylink.co.nz (Postfix) with ESMTP;
	Sat, 28 Feb 2009 04:31:13 +1300 (NZDT)
Received: by citylink.fud.org.nz (Postfix, from userid 1001)
	id 9D10611432; Sat, 28 Feb 2009 04:31:13 +1300 (NZDT)
Date: Fri, 27 Feb 2009 07:31:13 -0800
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Daichi GOTO <daichi@ongs.co.jp>
Message-ID: <20090227153113.GC53460@citylink.fud.org.nz>
References: <49A7840C.4020902@ongs.co.jp>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <49A7840C.4020902@ongs.co.jp>
User-Agent: Mutt/1.5.17 (2007-11-01)
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
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>, 
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 27 Feb 2009 15:31:19 -0000

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"