From owner-svn-src-all@FreeBSD.ORG  Wed Mar 23 19:41:45 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 18BF01065672;
	Wed, 23 Mar 2011 19:41:45 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 07CA78FC0C;
	Wed, 23 Mar 2011 19:41:45 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2NJfixR005142;
	Wed, 23 Mar 2011 19:41:44 GMT
	(envelope-from hselasky@svn.freebsd.org)
Received: (from hselasky@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2NJfi6E005140;
	Wed, 23 Mar 2011 19:41:44 GMT
	(envelope-from hselasky@svn.freebsd.org)
Message-Id: <201103231941.p2NJfi6E005140@svn.freebsd.org>
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Wed, 23 Mar 2011 19:41:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r219930 - head/sys/dev/usb/controller
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Mar 2011 19:41:45 -0000

Author: hselasky
Date: Wed Mar 23 19:41:44 2011
New Revision: 219930
URL: http://svn.freebsd.org/changeset/base/219930

Log:
  Comply with style(9).
  
  Reported by:	gavin
  MFC after:	14 days
  Approved by:	thompsa (mentor)

Modified:
  head/sys/dev/usb/controller/ehci.c

Modified: head/sys/dev/usb/controller/ehci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci.c	Wed Mar 23 19:30:47 2011	(r219929)
+++ head/sys/dev/usb/controller/ehci.c	Wed Mar 23 19:41:44 2011	(r219930)
@@ -1183,18 +1183,18 @@ _ehci_remove_qh(ehci_qh_t *sqh, ehci_qh_
 static void
 ehci_data_toggle_update(struct usb_xfer *xfer, uint16_t actlen, uint16_t xlen)
 {
-	uint8_t full = (actlen == xlen);
+	uint16_t rem;
 	uint8_t dt;
 
 	/* count number of full packets */
 	dt = (actlen / xfer->max_packet_size) & 1;
 
 	/* cumpute remainder */
-	actlen = actlen % xfer->max_packet_size;
+	rem = actlen % xfer->max_packet_size;
 
-	if (actlen > 0)
+	if (rem > 0)
 		dt ^= 1;	/* short packet at the end */
-	else if (!full)
+	else if (actlen != xlen)
 		dt ^= 1;	/* zero length packet at the end */
 
 	xfer->endpoint->toggle_next ^= dt;