From owner-svn-src-head@FreeBSD.ORG  Tue Aug  5 06:31:10 2014
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:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 70ACB8C4
 for <svn-src-head@freebsd.org>; Tue,  5 Aug 2014 06:31:10 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 37B582617
 for <svn-src-head@freebsd.org>; Tue,  5 Aug 2014 06:31:10 +0000 (UTC)
Received: from hselasky (uid 1241) (envelope-from hselasky@FreeBSD.org) id 5bee
 by svn.freebsd.org (DragonFly Mail Agent v0.9+);
 Tue, 05 Aug 2014 06:31:10 +0000
From: Hans Petter Selasky <hselasky@FreeBSD.org>
Date: Tue, 5 Aug 2014 06:31:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269563 - head/sys/dev/usb/controller
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Message-Id: <53e07a2e.5bee.1ee4e2f8@svn.freebsd.org>
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
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/options/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: Tue, 05 Aug 2014 06:31:10 -0000

Author: hselasky
Date: Tue Aug  5 06:31:09 2014
New Revision: 269563
URL: http://svnweb.freebsd.org/changeset/base/269563

Log:
  Ensure we catch USB transfers which complete right away.

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

Modified: head/sys/dev/usb/controller/saf1761_otg.c
==============================================================================
--- head/sys/dev/usb/controller/saf1761_otg.c	Tue Aug  5 05:00:22 2014	(r269562)
+++ head/sys/dev/usb/controller/saf1761_otg.c	Tue Aug  5 06:31:09 2014	(r269563)
@@ -1927,7 +1927,7 @@ saf1761_otg_start_standard_chain(struct 
 	/* poll one time */
 	saf1761_otg_xfer_do_fifo(sc, xfer);
 
-	if (xfer->td_transfer_cache != NULL) {
+	if (saf1761_otg_xfer_do_complete(sc, xfer) == 0) {
 		/*
 		 * Only enable the endpoint interrupt when we are
 		 * actually waiting for data, hence we are dealing
@@ -1943,9 +1943,6 @@ saf1761_otg_start_standard_chain(struct 
 			usbd_transfer_timeout_ms(xfer,
 			    &saf1761_otg_timeout, xfer->timeout);
 		}
-	} else {
-		/* catch completion, if any */
-		saf1761_otg_interrupt_complete_locked(sc);
 	}
 	USB_BUS_SPIN_UNLOCK(&sc->sc_bus);
 }