diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c index 4e2d71ff2eb2..0e00f0762588 100644 --- a/sys/dev/usb/ehci.c +++ b/sys/dev/usb/ehci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.121 2007/02/09 21:55:29 ad Exp $ */ +/* $NetBSD: ehci.c,v 1.122 2007/02/10 07:52:29 mlelstv Exp $ */ /* * Copyright (c) 2004,2005 The NetBSD Foundation, Inc. @@ -61,7 +61,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.121 2007/02/09 21:55:29 ad Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.122 2007/02/10 07:52:29 mlelstv Exp $"); #include "ohci.h" #include "uhci.h" @@ -1139,12 +1139,10 @@ ehci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer) if (xfer->busy_free != XFER_BUSY) { printf("ehci_freex: xfer=%p not busy, 0x%08x\n", xfer, xfer->busy_free); - return; } xfer->busy_free = XFER_FREE; if (!EXFER(xfer)->isdone) { printf("ehci_freex: !isdone\n"); - return; } #endif SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next); diff --git a/sys/dev/usb/ohci.c b/sys/dev/usb/ohci.c index 4220dd3dd7be..8c629653626e 100644 --- a/sys/dev/usb/ohci.c +++ b/sys/dev/usb/ohci.c @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.180 2007/01/19 22:46:21 drochner Exp $ */ +/* $NetBSD: ohci.c,v 1.181 2007/02/10 07:52:29 mlelstv Exp $ */ /* $FreeBSD: src/sys/dev/usb/ohci.c,v 1.22 1999/11/17 22:33:40 n_hibma Exp $ */ /* @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.180 2007/01/19 22:46:21 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ohci.c,v 1.181 2007/02/10 07:52:29 mlelstv Exp $"); #include #include @@ -999,7 +999,6 @@ ohci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer) if (xfer->busy_free != XFER_BUSY) { printf("ohci_freex: xfer=%p not busy, 0x%08x\n", xfer, xfer->busy_free); - return; } xfer->busy_free = XFER_FREE; #endif diff --git a/sys/dev/usb/uhci.c b/sys/dev/usb/uhci.c index 1241d9c086f7..f54105180a64 100644 --- a/sys/dev/usb/uhci.c +++ b/sys/dev/usb/uhci.c @@ -1,4 +1,4 @@ -/* $NetBSD: uhci.c,v 1.206 2007/01/19 22:46:21 drochner Exp $ */ +/* $NetBSD: uhci.c,v 1.207 2007/02/10 07:52:29 mlelstv Exp $ */ /* $FreeBSD: src/sys/dev/usb/uhci.c,v 1.33 1999/11/17 22:33:41 n_hibma Exp $ */ /* @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.206 2007/01/19 22:46:21 drochner Exp $"); +__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.207 2007/02/10 07:52:29 mlelstv Exp $"); #include #include @@ -701,12 +701,10 @@ uhci_freex(struct usbd_bus *bus, usbd_xfer_handle xfer) if (xfer->busy_free != XFER_BUSY) { printf("uhci_freex: xfer=%p not busy, 0x%08x\n", xfer, xfer->busy_free); - return; } xfer->busy_free = XFER_FREE; if (!UXFER(xfer)->iinfo.isdone) { printf("uhci_freex: !isdone\n"); - return; } #endif SIMPLEQ_INSERT_HEAD(&sc->sc_free_xfers, xfer, next); diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index 89faa91b1c47..c0907d40735d 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.117 2007/01/29 01:52:45 hubertf Exp $ */ +/* $NetBSD: usbdi.c,v 1.118 2007/02/10 07:52:29 mlelstv Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */ /* @@ -39,7 +39,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.117 2007/01/29 01:52:45 hubertf Exp $"); +__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.118 2007/02/10 07:52:29 mlelstv Exp $"); #include "opt_compat_netbsd.h" @@ -770,7 +770,6 @@ usb_transfer_complete(usbd_xfer_handle xfer) if (xfer->busy_free != XFER_ONQU) { printf("usb_transfer_complete: xfer=%p not busy 0x%08x\n", xfer, xfer->busy_free); - return; } #endif