From owner-svn-src-head@FreeBSD.ORG  Thu May 21 17:43:35 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6956A1065677;
	Thu, 21 May 2009 17:43:35 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 589B98FC1C;
	Thu, 21 May 2009 17:43:35 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4LHhZIR074003;
	Thu, 21 May 2009 17:43:35 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4LHhZAS074002;
	Thu, 21 May 2009 17:43:35 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200905211743.n4LHhZAS074002@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Thu, 21 May 2009 17:43:35 +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: r192555 - head/sys/dev/usb/controller
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 May 2009 17:43:35 -0000

Author: thompsa
Date: Thu May 21 17:43:35 2009
New Revision: 192555
URL: http://svn.freebsd.org/changeset/base/192555

Log:
  Fix a failure to report failure on stalled status stage for control
  transactions.
  
  Submitted by:	Hans Petter Selasky

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

Modified: head/sys/dev/usb/controller/ehci.c
==============================================================================
--- head/sys/dev/usb/controller/ehci.c	Thu May 21 17:42:32 2009	(r192554)
+++ head/sys/dev/usb/controller/ehci.c	Thu May 21 17:43:35 2009	(r192555)
@@ -1156,13 +1156,6 @@ ehci_non_isoc_done_sub(struct usb2_xfer 
 		}
 		/* Check for last transfer */
 		if (((void *)td) == xfer->td_transfer_last) {
-			if (len == 0) {
-				/*
-			         * Halt is ok if descriptor is last,
-			         * and complete:
-			         */
-				status &= ~EHCI_QTD_HALTED;
-			}
 			td = NULL;
 			break;
 		}