diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/usb/if_zyd.c | 8 | ||||
| -rw-r--r-- | sys/dev/usb/usbdi.c | 6 | ||||
| -rw-r--r-- | sys/dev/usb/usbdi.h | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sys/dev/usb/if_zyd.c b/sys/dev/usb/if_zyd.c index 2c523867ef3..73c4360b1e6 100644 --- a/sys/dev/usb/if_zyd.c +++ b/sys/dev/usb/if_zyd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_zyd.c,v 1.92 2013/11/05 10:20:05 mpi Exp $ */ +/* $OpenBSD: if_zyd.c,v 1.93 2013/11/06 15:55:15 jeremy Exp $ */ /*- * Copyright (c) 2006 by Damien Bergamini <damien.bergamini@free.fr> @@ -795,11 +795,11 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen, splx(s); printf("%s: could not send command (error=%s)\n", sc->sc_dev.dv_xname, usbd_errstr(error)); - (void)usbd_free_xfer(xfer); + usbd_free_xfer(xfer); return EIO; } if (!(flags & ZYD_CMD_FLAG_READ)) { - (void)usbd_free_xfer(xfer); + usbd_free_xfer(xfer); return 0; /* write: don't wait for reply */ } /* wait at most one second for command reply */ @@ -807,7 +807,7 @@ zyd_cmd(struct zyd_softc *sc, uint16_t code, const void *idata, int ilen, sc->odata = NULL; /* in case answer is received too late */ splx(s); - (void)usbd_free_xfer(xfer); + usbd_free_xfer(xfer); return error; } diff --git a/sys/dev/usb/usbdi.c b/sys/dev/usb/usbdi.c index ce3e964cbc8..533a5b098d9 100644 --- a/sys/dev/usb/usbdi.c +++ b/sys/dev/usb/usbdi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.c,v 1.64 2013/11/02 01:41:17 jeremy Exp $ */ +/* $OpenBSD: usbdi.c,v 1.65 2013/11/06 15:55:15 jeremy Exp $ */ /* $NetBSD: usbdi.c,v 1.103 2002/09/27 15:37:38 provos Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.c,v 1.28 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -411,14 +411,14 @@ usbd_alloc_xfer(struct usbd_device *dev) return (xfer); } -usbd_status +void usbd_free_xfer(struct usbd_xfer *xfer) { DPRINTFN(5,("usbd_free_xfer: %p\n", xfer)); if (xfer->rqflags & (URQ_DEV_DMABUF | URQ_AUTO_DMABUF)) usbd_free_buffer(xfer); xfer->device->bus->methods->freex(xfer->device->bus, xfer); - return (USBD_NORMAL_COMPLETION); + return; } void diff --git a/sys/dev/usb/usbdi.h b/sys/dev/usb/usbdi.h index 294fd1132de..a3df64cefe0 100644 --- a/sys/dev/usb/usbdi.h +++ b/sys/dev/usb/usbdi.h @@ -1,4 +1,4 @@ -/* $OpenBSD: usbdi.h,v 1.56 2013/11/02 01:41:17 jeremy Exp $ */ +/* $OpenBSD: usbdi.h,v 1.57 2013/11/06 15:55:15 jeremy Exp $ */ /* $NetBSD: usbdi.h,v 1.62 2002/07/11 21:14:35 augustss Exp $ */ /* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */ @@ -88,7 +88,7 @@ usbd_status usbd_open_pipe(struct usbd_interface *iface, u_int8_t address, usbd_status usbd_close_pipe(struct usbd_pipe *pipe); usbd_status usbd_transfer(struct usbd_xfer *req); struct usbd_xfer *usbd_alloc_xfer(struct usbd_device *); -usbd_status usbd_free_xfer(struct usbd_xfer *xfer); +void usbd_free_xfer(struct usbd_xfer *xfer); void usbd_setup_xfer(struct usbd_xfer *xfer, struct usbd_pipe *pipe, void *priv, void *buffer, u_int32_t length, u_int16_t flags, u_int32_t timeout, usbd_callback); |