diff options
| author | Srinivasarao P <spathi@codeaurora.org> | 2018-08-02 12:09:16 +0530 |
|---|---|---|
| committer | Srinivasarao P <spathi@codeaurora.org> | 2018-08-03 17:06:33 +0530 |
| commit | 499dddad34fa922f92339b98ff7f31b21be69893 (patch) | |
| tree | 7e9003dbce2fbc8c2f933f6af8d610ebcdc1a56e /drivers/usb/class/cdc-acm.c | |
| parent | facb909e66d37224f564750e8ebc693b91934ec6 (diff) | |
| parent | 05670d3d98f96844679f61cad014f74e85446999 (diff) | |
Merge android-4.4.145 (05670d3) into msm-4.4
* refs/heads/tmp-05670d3
Linux 4.4.145
ARM: fix put_user() for gcc-8
turn off -Wattribute-alias
can: xilinx_can: fix RX overflow interrupt not being enabled
can: xilinx_can: fix incorrect clear of non-processed interrupts
can: xilinx_can: keep only 1-2 frames in TX FIFO to fix TX accounting
can: xilinx_can: fix device dropping off bus on RX overrun
can: xilinx_can: fix recovery from error states not being propagated
can: xilinx_can: fix RX loop if RXNEMP is asserted without RXOK
driver core: Partially revert "driver core: correct device's shutdown order"
usb: gadget: f_fs: Only return delayed status when len is 0
usb: core: handle hub C_PORT_OVER_CURRENT condition
usb: cdc_acm: Add quirk for Castles VEGA3000
ip: in cmsg IP(V6)_ORIGDSTADDR call pskb_may_pull
tcp: detect malicious patterns in tcp_collapse_ofo_queue()
tcp: avoid collapses in tcp_prune_queue() if possible
tcp: do not delay ACK in DCTCP upon CE status change
tcp: do not cancel delay-AcK on DCTCP special ACK
tcp: helpers to send special DCTCP ack
tcp: fix dctcp delayed ACK schedule
rtnetlink: add rtnl_link_state check in rtnl_configure_link
net/mlx4_core: Save the qpn from the input modifier in RST2INIT wrapper
ip: hash fragments consistently
MIPS: ath79: fix register address in ath79_ddr_wb_flush()
Conflicts:
drivers/usb/gadget/function/f_fs.c
include/net/tcp.h
Change-Id: Ib1c2f633df7b9f28c5f99609c35600cbb916e657
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'drivers/usb/class/cdc-acm.c')
| -rw-r--r-- | drivers/usb/class/cdc-acm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index 7ed30d0b5273..a501f3ba6a3f 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c @@ -1771,6 +1771,9 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x09d8, 0x0320), /* Elatec GmbH TWN3 */ .driver_info = NO_UNION_NORMAL, /* has misplaced union descriptor */ }, + { USB_DEVICE(0x0ca6, 0xa050), /* Castles VEGA3000 */ + .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ + }, { USB_DEVICE(0x2912, 0x0001), /* ATOL FPrint */ .driver_info = CLEAR_HALT_CONDITIONS, |