From d0813533425670f15b768aaa05c1c11a5d4a169b Mon Sep 17 00:00:00 2001 From: Weongyo Jeong Date: Thu, 15 Jan 2009 07:11:14 +0000 Subject: [PATCH] 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 --- sys/dev/usb/ehci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 11a5e83cc3fa..c1596003de80 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -2769,7 +2769,7 @@ ehci_abort_xfer(usbd_xfer_handle xfer, usbd_status status) /* 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