diff options
| author | Linaro CI <ci-bot@linaro.org> | 2021-12-15 23:01:10 +0000 |
|---|---|---|
| committer | Linaro CI <ci-bot@linaro.org> | 2021-12-15 23:01:10 +0000 |
| commit | 4d8cf6624d546eda3024d27c2a5a820645b7cb22 (patch) | |
| tree | c6cd79aecb581c3fa57c678d96acf16186cb273c | |
| parent | 58edbaa3585ce0255db1a29e181005f616f5d064 (diff) | |
| parent | 201fed0960718c472d7c2fc47fdeb52e6767b233 (diff) | |
| download | hikey-linaro-4.9.293-201fed096071-20211215-817.tar.gz | |
Merge remote-tracking branch 'aosp/android-4.9-p' into android-4.9-p-hikey4.9.293-201fed096071-20211215-817
* aosp/android-4.9-p:
FROMGIT: USB: gadget: bRequestType is a bitfield, not a enum
| -rw-r--r-- | drivers/usb/gadget/composite.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/legacy/dbgp.c | 6 | ||||
| -rw-r--r-- | drivers/usb/gadget/legacy/inode.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c index ff0084bd9955..bcbee1242623 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c @@ -1632,14 +1632,14 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) u8 endp; if (w_length > USB_COMP_EP0_BUFSIZ) { - if (ctrl->bRequestType == USB_DIR_OUT) { - goto done; - } else { + if (ctrl->bRequestType & USB_DIR_IN) { /* Cast away the const, we are going to overwrite on purpose. */ __le16 *temp = (__le16 *)&ctrl->wLength; *temp = cpu_to_le16(USB_COMP_EP0_BUFSIZ); w_length = USB_COMP_EP0_BUFSIZ; + } else { + goto done; } } diff --git a/drivers/usb/gadget/legacy/dbgp.c b/drivers/usb/gadget/legacy/dbgp.c index f1c5a22704b2..e8818ad973e4 100644 --- a/drivers/usb/gadget/legacy/dbgp.c +++ b/drivers/usb/gadget/legacy/dbgp.c @@ -345,14 +345,14 @@ static int dbgp_setup(struct usb_gadget *gadget, u16 len = 0; if (length > DBGP_REQ_LEN) { - if (ctrl->bRequestType == USB_DIR_OUT) { - return err; - } else { + if (ctrl->bRequestType & USB_DIR_IN) { /* Cast away the const, we are going to overwrite on purpose. */ __le16 *temp = (__le16 *)&ctrl->wLength; *temp = cpu_to_le16(DBGP_REQ_LEN); length = DBGP_REQ_LEN; + } else { + return err; } } diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c index d39bd1a1ab8f..19eb954a7afa 100644 --- a/drivers/usb/gadget/legacy/inode.c +++ b/drivers/usb/gadget/legacy/inode.c @@ -1339,14 +1339,14 @@ gadgetfs_setup (struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) u16 w_length = le16_to_cpu(ctrl->wLength); if (w_length > RBUF_SIZE) { - if (ctrl->bRequestType == USB_DIR_OUT) { - return value; - } else { + if (ctrl->bRequestType & USB_DIR_IN) { /* Cast away the const, we are going to overwrite on purpose. */ __le16 *temp = (__le16 *)&ctrl->wLength; *temp = cpu_to_le16(RBUF_SIZE); w_length = RBUF_SIZE; + } else { + return value; } } |