Thu Jan 10 20:31:05 2013 UTC ()
add missing call to dwc_otg_xfer_end() in dwc_otg_device_bulk_done


(jmcneill)
diff -r1.1 -r1.2 src/sys/dev/usb/dwc_otg.c
cvs diff -r1.1 -r1.2 src/sys/dev/usb/Attic/dwc_otg.c (expand / switch to unified diff)

--- src/sys/dev/usb/Attic/dwc_otg.c 2013/01/09 22:23:44 1.1
+++ src/sys/dev/usb/Attic/dwc_otg.c 2013/01/10 20:31:04 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: dwc_otg.c,v 1.1 2013/01/09 22:23:44 skrll Exp $ */ 1/* $NetBSD: dwc_otg.c,v 1.2 2013/01/10 20:31:04 jmcneill Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2012 Hans Petter Selasky. All rights reserved. 4 * Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
5 * Copyright (c) 2010-2011 Aleksandr Rybalko. All rights reserved. 5 * Copyright (c) 2010-2011 Aleksandr Rybalko. All rights reserved.
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
11 * notice, this list of conditions and the following disclaimer. 11 * notice, this list of conditions and the following disclaimer.
12 * 2. Redistributions in binary form must reproduce the above copyright 12 * 2. Redistributions in binary form must reproduce the above copyright
13 * notice, this list of conditions and the following disclaimer in the 13 * notice, this list of conditions and the following disclaimer in the
14 * documentation and/or other materials provided with the distribution. 14 * documentation and/or other materials provided with the distribution.
@@ -50,27 +50,27 @@ @@ -50,27 +50,27 @@
50 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 50 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
51 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 51 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
52 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 52 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
53 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 53 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
54 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 54 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
55 * POSSIBILITY OF SUCH DAMAGE. 55 * POSSIBILITY OF SUCH DAMAGE.
56 */ 56 */
57 57
58/* 58/*
59 * Designware USB 2.0 OTG 59 * Designware USB 2.0 OTG
60 */ 60 */
61 61
62#include <sys/cdefs.h> 62#include <sys/cdefs.h>
63__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.1 2013/01/09 22:23:44 skrll Exp $"); 63__KERNEL_RCSID(0, "$NetBSD: dwc_otg.c,v 1.2 2013/01/10 20:31:04 jmcneill Exp $");
64 64
65#include <sys/param.h> 65#include <sys/param.h>
66#include <sys/systm.h> 66#include <sys/systm.h>
67#include <sys/kmem.h> 67#include <sys/kmem.h>
68#include <sys/kernel.h> 68#include <sys/kernel.h>
69#include <sys/device.h> 69#include <sys/device.h>
70#include <sys/select.h> 70#include <sys/select.h>
71#include <sys/proc.h> 71#include <sys/proc.h>
72#include <sys/queue.h> 72#include <sys/queue.h>
73#include <sys/cpu.h> 73#include <sys/cpu.h>
74 74
75#include <machine/endian.h> 75#include <machine/endian.h>
76 76
@@ -1400,26 +1400,27 @@ dwc_otg_device_bulk_close(usbd_pipe_hand @@ -1400,26 +1400,27 @@ dwc_otg_device_bulk_close(usbd_pipe_hand
1400 DPRINTF("\n"); 1400 DPRINTF("\n");
1401 1401
1402 dpipe = dpipe; 1402 dpipe = dpipe;
1403 sc = sc; 1403 sc = sc;
1404} 1404}
1405 1405
1406Static void 1406Static void
1407dwc_otg_device_bulk_done(usbd_xfer_handle xfer) 1407dwc_otg_device_bulk_done(usbd_xfer_handle xfer)
1408{ 1408{
1409 struct dwc_otg_softc *sc = xfer->pipe->device->bus->hci_private; 1409 struct dwc_otg_softc *sc = xfer->pipe->device->bus->hci_private;
1410 1410
1411 DPRINTF("\n"); 1411 DPRINTF("\n");
1412 1412
 1413 dwc_otg_xfer_end(xfer);
1413 sc = sc; 1414 sc = sc;
1414} 1415}
1415 1416
1416/***********************************************************************/ 1417/***********************************************************************/
1417 1418
1418Static usbd_status 1419Static usbd_status
1419dwc_otg_device_intr_transfer(usbd_xfer_handle xfer) 1420dwc_otg_device_intr_transfer(usbd_xfer_handle xfer)
1420{ 1421{
1421 struct dwc_otg_softc *sc = xfer->pipe->device->bus->hci_private; 1422 struct dwc_otg_softc *sc = xfer->pipe->device->bus->hci_private;
1422 usbd_status err; 1423 usbd_status err;
1423 1424
1424 DPRINTF("\n"); 1425 DPRINTF("\n");
1425 1426