From owner-svn-src-head@FreeBSD.ORG  Thu Jan 15 07:11:14 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 95D751065672;
	Thu, 15 Jan 2009 07:11:14 +0000 (UTC)
	(envelope-from weongyo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 851BF8FC13;
	Thu, 15 Jan 2009 07:11:14 +0000 (UTC)
	(envelope-from weongyo@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 n0F7BEFG067810;
	Thu, 15 Jan 2009 07:11:14 GMT (envelope-from weongyo@svn.freebsd.org)
Received: (from weongyo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0F7BEQn067808;
	Thu, 15 Jan 2009 07:11:14 GMT (envelope-from weongyo@svn.freebsd.org)
Message-Id: <200901150711.n0F7BEQn067808@svn.freebsd.org>
From: Weongyo Jeong <weongyo@FreeBSD.org>
Date: Thu, 15 Jan 2009 07:11:14 +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: r187291 - head/sys/dev/usb
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, 15 Jan 2009 07:11:15 -0000

Author: weongyo
Date: Thu Jan 15 07:11:14 2009
New Revision: 187291
URL: http://svn.freebsd.org/changeset/base/187291

Log:
  fix a ehci's bug that it's occurred when the xfers are aborted under
  heavy loads or working.  It looks this bug exists since r158869
  so needs to revert a part of the previous.
  
  Reviewed by:	imp
  Tested by:	sam
  MFC after:	3 weeks

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

Modified: head/sys/dev/usb/ehci.c
==============================================================================
--- head/sys/dev/usb/ehci.c	Thu Jan 15 06:54:59 2009	(r187290)
+++ head/sys/dev/usb/ehci.c	Thu Jan 15 07:11:14 2009	(r187291)
@@ -2769,7 +2769,7 @@ ehci_abort_xfer(usbd_xfer_handle xfer, u
 
 	/* We will change them to point here */
 	snext = exfer->sqtdend->nextqtd;
-	next = htohc32(sc, snext->physaddr);
+	next = (snext != NULL) ? htohc32(sc, snext->physaddr) : EHCI_NULL(sc);
 
 	/*
 	 * Now loop through any qTDs before us and keep track of the pointer