diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-06-08 00:24:14 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2004-06-08 00:24:14 +0000 |
| commit | 45bfcc58f9b8e62e654b56991c245fd51a988c96 (patch) | |
| tree | a783b27aeef3542a2c50106f4f58eae1bf934ff1 /sys/dev/usb/umass.c | |
| parent | 25c9f333f4ecb522ee1bc6632b9f40e24d34485b (diff) | |
Make umass CBI buffer handling consistant with BBB buffer handling by
using sc->data_buffer (not sc->tranfer_data), in the actual data
transfer operations. From NetBSD PR #25676.
ok tdeval@ deraadt@
Diffstat (limited to 'sys/dev/usb/umass.c')
| -rw-r--r-- | sys/dev/usb/umass.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/dev/usb/umass.c b/sys/dev/usb/umass.c index a98a395650a..65db9de25d7 100644 --- a/sys/dev/usb/umass.c +++ b/sys/dev/usb/umass.c @@ -1,4 +1,4 @@ -/* $OpenBSD: umass.c,v 1.25 2003/11/07 11:10:47 jmc Exp $ */ +/* $OpenBSD: umass.c,v 1.26 2004/06/08 00:24:13 krw Exp $ */ /* $NetBSD: umass.c,v 1.96 2003/04/26 12:46:59 dsainty Exp $ */ /*- * Copyright (c) 1999 MAEKAWA Masahide <bishop@rr.iij4u.or.jp>, @@ -1437,7 +1437,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv, sc->transfer_state = TSTATE_CBI_DATA; if (sc->transfer_dir == DIR_IN) { if (umass_setup_transfer(sc, sc->sc_pipe[UMASS_BULKIN], - sc->transfer_data, sc->transfer_datalen, + sc->data_buffer, sc->transfer_datalen, USBD_SHORT_XFER_OK | USBD_NO_COPY, sc->transfer_xfer[XFER_CBI_DATA])) umass_cbi_reset(sc, STATUS_WIRE_FAILED); @@ -1446,7 +1446,7 @@ umass_cbi_state(usbd_xfer_handle xfer, usbd_private_handle priv, memcpy(sc->data_buffer, sc->transfer_data, sc->transfer_datalen); if (umass_setup_transfer(sc, sc->sc_pipe[UMASS_BULKOUT], - sc->transfer_data, sc->transfer_datalen, + sc->data_buffer, sc->transfer_datalen, USBD_NO_COPY,/* fixed length transfer */ sc->transfer_xfer[XFER_CBI_DATA])) umass_cbi_reset(sc, STATUS_WIRE_FAILED); |