From owner-p4-projects@FreeBSD.ORG  Mon Jul 17 18:40:48 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EF2B416A4E1; Mon, 17 Jul 2006 18:40:47 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B0CC816A4DE
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 18:40:47 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 7DF7143D46
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 18:40:47 +0000 (GMT)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6HIeloF026801
	for <perforce@FreeBSD.org>; Mon, 17 Jul 2006 18:40:47 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6HIelkw026798
	for perforce@freebsd.org; Mon, 17 Jul 2006 18:40:47 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 17 Jul 2006 18:40:47 GMT
Message-Id: <200607171840.k6HIelkw026798@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 101783 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 17 Jul 2006 18:40:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=101783

Change 101783 by hselasky@hselasky_mini_itx on 2006/07/17 18:39:53

	Make the USB_DEVICEINFO IOCTL backwards compatible.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb.c#6 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/usb.c#6 (text+ko) ====

@@ -857,13 +857,18 @@
 			int addr = di->udi_addr;
 
 			if((addr < 1) ||
-			   (addr >= USB_MAX_DEVICES) ||
-			   (bus->devices[addr] == 0))
+			   (addr >= USB_MAX_DEVICES))
 			{
 				error = EINVAL;
 				goto done;
 			}
 
+			if (bus->devices[addr] == 0)
+			{
+				error = ENXIO;
+				goto done;
+			}
+
 			error = usbd_fill_deviceinfo(bus->devices[addr], di, 1);
 			goto done;
 		}