diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-19 07:11:53 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-19 07:11:53 +0200 |
| commit | e70c971d7d8ac5b19fea1c2fde0290bcf7881946 (patch) | |
| tree | d022e67b2141b48cfc0ac5b6245588c7f23c6c67 /drivers/usb/core/message.c | |
| parent | a3c59cf2971088c4bf889d8c093990ebf59fb789 (diff) | |
| parent | d1abaeb3be7b5fa6d7a1fbbd2e14e3310005c4c1 (diff) | |
| download | blackbird-op-linux-e70c971d7d8ac5b19fea1c2fde0290bcf7881946.tar.gz blackbird-op-linux-e70c971d7d8ac5b19fea1c2fde0290bcf7881946.zip | |
Merge 5.3-rc5 into char-misc-next
We need the char/misc fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/core/message.c')
| -rw-r--r-- | drivers/usb/core/message.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/core/message.c b/drivers/usb/core/message.c index e844bb7b5676..5adf489428aa 100644 --- a/drivers/usb/core/message.c +++ b/drivers/usb/core/message.c @@ -2218,14 +2218,14 @@ int cdc_parse_cdc_header(struct usb_cdc_parsed_header *hdr, (struct usb_cdc_dmm_desc *)buffer; break; case USB_CDC_MDLM_TYPE: - if (elength < sizeof(struct usb_cdc_mdlm_desc *)) + if (elength < sizeof(struct usb_cdc_mdlm_desc)) goto next_desc; if (desc) return -EINVAL; desc = (struct usb_cdc_mdlm_desc *)buffer; break; case USB_CDC_MDLM_DETAIL_TYPE: - if (elength < sizeof(struct usb_cdc_mdlm_detail_desc *)) + if (elength < sizeof(struct usb_cdc_mdlm_detail_desc)) goto next_desc; if (detail) return -EINVAL; |
