From owner-p4-projects@FreeBSD.ORG  Fri Jun 15 16:00:55 2007
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 AF6EE16A46C; Fri, 15 Jun 2007 16:00:55 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 6B1AF16A468
	for <perforce@FreeBSD.org>; Fri, 15 Jun 2007 16:00:55 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.freebsd.org (Postfix) with ESMTP id 5CA4913C4CC
	for <perforce@FreeBSD.org>; Fri, 15 Jun 2007 16:00:55 +0000 (UTC)
	(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l5FG0tYT069725
	for <perforce@FreeBSD.org>; Fri, 15 Jun 2007 16:00:55 GMT
	(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l5FG0tBr069714
	for perforce@freebsd.org; Fri, 15 Jun 2007 16:00:55 GMT
	(envelope-from rpaulo@FreeBSD.org)
Date: Fri, 15 Jun 2007 16:00:55 GMT
Message-Id: <200706151600.l5FG0tBr069714@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 121698 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: Fri, 15 Jun 2007 16:00:56 -0000

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

Change 121698 by rpaulo@rpaulo_epsilon on 2007/06/15 16:00:38

	Adapt to the following commit:
	
	date: 2007/06/12 15:37:18;  author: imp
	Expand USB_ATTACH_{ERROR,SUCCESS}_RETURN inline and eliminate from
	usb_port.h.  They aren't needed, and are a legacy of this code's past.

Affected files ...

.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#5 edit

Differences ...

==== //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#5 (text+ko) ====

@@ -184,7 +184,7 @@
 		if (err) {
 			printf("%s: could not read report descriptor\n",
 			       device_get_nameunit(sc->sc_dev));
-			USB_ATTACH_ERROR_RETURN;
+			return ENXIO;
 		}
 
 		if (hid_locate(desc, size, HID_USAGE2(HUP_CUSTOM, HUC_FNKEY),