diff options
| author | hselasky <hselasky@FreeBSD.org> | 2013-08-25 08:42:50 +0000 |
|---|---|---|
| committer | hselasky <hselasky@FreeBSD.org> | 2013-08-25 08:42:50 +0000 |
| commit | a08ed509f5a265fbdd25cf079ef014868cdcecf0 (patch) | |
| tree | e10792d461f95bc7d38444cf9c56b2d8f2329560 | |
| parent | 43f8960ec8512d0bdff16abf521438e31c9432b8 (diff) | |
| download | FreeBSD-src-a08ed509f5a265fbdd25cf079ef014868cdcecf0.zip FreeBSD-src-a08ed509f5a265fbdd25cf079ef014868cdcecf0.tar.gz | |
Bugfix: The endpoint profile should only be checked in device mode when
allocating USB transfers and not in host mode.
Reported by: George Mitchell <george+freebsd@m5p.com>
| -rw-r--r-- | sys/dev/usb/controller/dwc_otg.c | 20 | ||||
| -rw-r--r-- | sys/dev/usb/controller/musb_otg.c | 12 |
2 files changed, 17 insertions, 15 deletions
diff --git a/sys/dev/usb/controller/dwc_otg.c b/sys/dev/usb/controller/dwc_otg.c index d08b3d9..7c3b881 100644 --- a/sys/dev/usb/controller/dwc_otg.c +++ b/sys/dev/usb/controller/dwc_otg.c @@ -3968,7 +3968,6 @@ done: static void dwc_otg_xfer_setup(struct usb_setup_params *parm) { - const struct usb_hw_ep_profile *pf; struct usb_xfer *xfer; void *last_obj; uint32_t ntd; @@ -4011,16 +4010,21 @@ dwc_otg_xfer_setup(struct usb_setup_params *parm) */ last_obj = NULL; + ep_no = xfer->endpointno & UE_ADDR; + /* - * get profile stuff + * Check for a valid endpoint profile in USB device mode: */ - ep_no = xfer->endpointno & UE_ADDR; - dwc_otg_get_hw_ep_profile(parm->udev, &pf, ep_no); + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { + const struct usb_hw_ep_profile *pf; - if (pf == NULL) { - /* should not happen */ - parm->err = USB_ERR_INVAL; - return; + dwc_otg_get_hw_ep_profile(parm->udev, &pf, ep_no); + + if (pf == NULL) { + /* should not happen */ + parm->err = USB_ERR_INVAL; + return; + } } /* align data */ diff --git a/sys/dev/usb/controller/musb_otg.c b/sys/dev/usb/controller/musb_otg.c index 5113d7a..9b2974f 100644 --- a/sys/dev/usb/controller/musb_otg.c +++ b/sys/dev/usb/controller/musb_otg.c @@ -4026,7 +4026,6 @@ done: static void musbotg_xfer_setup(struct usb_setup_params *parm) { - const struct usb_hw_ep_profile *pf; struct musbotg_softc *sc; struct usb_xfer *xfer; void *last_obj; @@ -4088,12 +4087,14 @@ musbotg_xfer_setup(struct usb_setup_params *parm) */ last_obj = NULL; + ep_no = xfer->endpointno & UE_ADDR; + /* - * get profile stuff + * Check for a valid endpoint profile in USB device mode: */ - if (ntd) { + if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) { + const struct usb_hw_ep_profile *pf; - ep_no = xfer->endpointno & UE_ADDR; musbotg_get_hw_ep_profile(parm->udev, &pf, ep_no); if (pf == NULL) { @@ -4101,9 +4102,6 @@ musbotg_xfer_setup(struct usb_setup_params *parm) parm->err = USB_ERR_INVAL; return; } - } else { - ep_no = 0; - pf = NULL; } /* align data */ |
