From owner-p4-projects@FreeBSD.ORG  Sat Dec 15 17:14:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E0BDB16A468; Sat, 15 Dec 2007 17:14:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A60DE16A41A
	for <perforce@FreeBSD.org>; Sat, 15 Dec 2007 17:14:19 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8697B13C4E5
	for <perforce@FreeBSD.org>; Sat, 15 Dec 2007 17:14:19 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lBFHEJIN080515
	for <perforce@FreeBSD.org>; Sat, 15 Dec 2007 17:14:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lBFHEJMS080512
	for perforce@freebsd.org; Sat, 15 Dec 2007 17:14:19 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sat, 15 Dec 2007 17:14:19 GMT
Message-Id: <200712151714.lBFHEJMS080512@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 130959 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: Sat, 15 Dec 2007 17:14:20 -0000

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

Change 130959 by hselasky@hselasky_laptop001 on 2007/12/15 17:13:42

	
	Style change by "usb_style.sh".

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#72 edit

Differences ...

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

@@ -1202,36 +1202,36 @@
 	xfer->usb_thread = td;
 
 	if (xfer->flags_int.control_xfr) {
-	  if (xfer->flags_int.control_hdr) {
+		if (xfer->flags_int.control_hdr) {
 
-		/* copy out the USB request */
+			/* copy out the USB request */
 
-		if (xfer->frlengths[0] == sizeof(std->req)) {
-			usbd_copy_out(xfer->frbuffers + 0, 0,
-			    &(std->req), sizeof(std->req));
-		} else {
-			std->err = USBD_INVAL;
-			goto done;
-		}
+			if (xfer->frlengths[0] == sizeof(std->req)) {
+				usbd_copy_out(xfer->frbuffers + 0, 0,
+				    &(std->req), sizeof(std->req));
+			} else {
+				std->err = USBD_INVAL;
+				goto done;
+			}
 
-		xfer->aframes = 1;
+			xfer->aframes = 1;
 
-		std->err = 0;
-		std->state = USBD_STD_ROOT_TR_SETUP;
+			std->err = 0;
+			std->state = USBD_STD_ROOT_TR_SETUP;
 
-		(func) (xfer, std);
+			(func) (xfer, std);
 
-		if (xfer->usb_thread != td) {
-			/* transfer cancelled */
-			goto done;
+			if (xfer->usb_thread != td) {
+				/* transfer cancelled */
+				goto done;
+			}
+			if (std->err) {
+				goto done;
+			}
+		} else {
+			/* skip the first frame in this case */
+			xfer->aframes = 1;
 		}
-		if (std->err) {
-			goto done;
-		}
-	  } else {
-	      /* skip the first frame in this case */
-	      xfer->aframes = 1;
-	  }
 	}
 	std->err = 0;
 	std->state = USBD_STD_ROOT_TR_PRE_DATA;