d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: The endpoint profile should only be checked in device mode when

Browse Source 
allocating USB transfers and not in host mode.

Reported by:	George Mitchell <george+freebsd@m5p.com>
This commit is contained in:
Hans Petter Selasky 2013-08-25 08:42:50 +00:00
parent 81e9f2d5d8
commit 8f39f442c9
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/dev/usb/controller/dwc_otg.c
View File

@ -3968,7 +3968,6 @@ dwc_otg_roothub_exec(struct usb_device *udev,
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;
/*
* get profile stuff
*/
ep_no = xfer->endpointno & UE_ADDR;
dwc_otg_get_hw_ep_profile(parm->udev, &pf, ep_no);
if (pf == NULL) {
/* should not happen */
parm->err = USB_ERR_INVAL;
return;
/*
* Check for a valid endpoint profile in USB device mode:
*/
if (xfer->flags_int.usb_mode == USB_MODE_DEVICE) {
const struct usb_hw_ep_profile *pf;
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 */

16
sys/dev/usb/controller/musb_otg.c
View File

@ -4026,7 +4026,6 @@ musbotg_roothub_exec(struct usb_device *udev,
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;
/*
* get profile stuff
*/
if (ntd) {
ep_no = xfer->endpointno & UE_ADDR;
/*
* Check for a valid endpoint profile in USB device mode:
*/
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 */