svn commit: r187291 - head/sys/dev/usb

Weongyo Jeong weongyo at FreeBSD.org
Wed Jan 14 23:11:15 PST 2009


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


More information about the svn-src-head mailing list