OrgACRN
/
acrn-hypervisor
mirror of https://github.com/projectacrn/acrn-hypervisor.git
1
0
Fork 0
Code Issues Releases Wiki Activity

DM USB: fix enumeration related issues 

The patch fixes enumeration related issues introduced by commit 'fc3d19'.

Tracked-On: #3612
Signed-off-by: Xiaoguang Wu <xiaoguang.wu@intel.com>
Acked-by: Yu Wang <yu1.wang@intel.com>
This commit is contained in:
Xiaoguang Wu 2019-09-02 11:52:26 +08:00 committed by ACRN System Integration
parent e7179aa7a0
commit be0a4b692b
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devicemodel/hw/platform/usb_pmapper.c
View File

@ -962,11 +962,6 @@ usb_dev_request(void *pdata, struct usb_data_xfer *xfer)
blk = usb_dev_prepare_ctrl_xfer(xfer);
data = blk ? blk->buf : NULL;
if (data == NULL) {
xfer->status = USB_ERR_IOERROR;
UPRINTF(LFTL, "%s unexpected NULL data\r\n", __func__);
goto out;
}
UPRINTF(LDBG, "%d-%s: urb: type 0x%x req 0x%x val 0x%x idx %d len %d "
"data %d\r\n", udev->info.path.bus,
@ -1016,6 +1011,13 @@ usb_dev_request(void *pdata, struct usb_data_xfer *xfer)
}
/* (data == NULL && len == 0) is okey to libusb_control_transfer */
if (data == NULL && len) {
xfer->status = USB_ERR_IOERROR;
UPRINTF(LFTL, "%s unexpected NULL data\r\n", __func__);
goto out;
}
/* send it to physical device */
/* FIXME: In the process of implementation of USB isochronouse transfer,
* the timeout time is not enough for Plantronics headset. So this
@ -1029,7 +1031,7 @@ usb_dev_request(void *pdata, struct usb_data_xfer *xfer)
* supported and the following code is used as a workaround now.
* UAS will be implemented in future.
*/
if (need_chk_uas)
if (need_chk_uas && data)
clear_uas_desc(udev, data, rc);
if (rc >= 0 && blk) {