Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update my fork with torvalds #4

Merged
merged 70 commits into from
Nov 12, 2014
Merged

Update my fork with torvalds #4

Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
9599815
usb: dwc2: gadget: fix enumeration issues
mszyprow Oct 20, 2014
f4fd36b
arm64: psci: fix cpu_suspend to check idle state type for index
Oct 30, 2014
1912528
USB: kobil_sct: fix non-atomic allocation in write path
jhovold Oct 29, 2014
e681286
USB: opticon: fix non-atomic allocation in write path
jhovold Oct 29, 2014
cf84a69
USB: cdc-acm: add device id for GW Instek AFG-2225
jhovold Oct 27, 2014
24cb450
cdc-acm: ensure that termios get set when the port is activated
jimparis Oct 30, 2014
90a646c
usb: Do not allow usb_alloc_streams on unconfigured devices
jwrdegoede Oct 1, 2014
93c9bf4
usb-storage: handle a skipped data phase
AlanStern Oct 31, 2014
aee0ce3
uas: Add US_FL_NO_ATA_1X quirk for 1 more Seagate model
jwrdegoede Oct 31, 2014
cee2448
USB: HWA: fix a warning message
Oct 29, 2014
2391eac
xhci: Disable streams on Asmedia 1042 xhci controllers
jwrdegoede Oct 28, 2014
673029f
uas: Add NO_ATA_1X for VIA VL711 devices
jwrdegoede Oct 9, 2014
cd6e245
usb: Remove references to non-existent PLAT_S5P symbol
Oct 7, 2014
ec5633b
usb: storage: fix build warnings !CONFIG_PM
Oct 1, 2014
2e06923
MAINTAINERS: Remove duplicate entry for usbip driver
einonm Oct 19, 2014
876af5d
USB: quirks: enable device-qualifier quirk for another Elan touchscreen
Oct 9, 2014
d749947
USB: quirks: enable device-qualifier quirk for yet another Elan touch…
Oct 9, 2014
b45abac
xhci: no switching back on non-ULT Haswell
Oct 27, 2014
d1d9548
uas: Add US_FL_NO_ATA_1X quirk for 2 more Seagate models
jwrdegoede Oct 23, 2014
01ed67d
usb: core: need to call usb_phy_notify_connect after device setup
Oct 17, 2014
b2108f1
usb: core: notify disconnection when core detects disconnect
Nov 4, 2014
c72c553
ARM: imx: clk-vf610: define PLL's clock tree
agners Oct 27, 2014
a87fa1d
of: Fix overflow bug in string property parsing functions
glikely Nov 3, 2014
89fbec5
ARM: imx: Fix the removal of CONFIG_SPI option
Nov 4, 2014
6e5aafb
Btrfs: fix kfree on list_head in btrfs_lookup_csums_range error cleanup
masoncl Nov 4, 2014
83b3d53
Merge tag 'imx-fixes-3.18-2' of git://git.kernel.org/pub/scm/linux/ke…
olofj Nov 5, 2014
8bcdd92
MAINTAINERS: update bcm2835 entry
swarren Nov 5, 2014
97b56be
arm64: compat: Enable bpf syscall
ctmarinas Nov 5, 2014
2d39ad6
arm64: defconfig: update defconfig for 3.18
wildea01 Nov 5, 2014
4a53d3a
staging:iio:ad5933: Fix NULL pointer deref when enabling buffer
larsclausen Sep 25, 2014
97fb303
staging:iio:ad5933: Drop "raw" from channel names
larsclausen Sep 25, 2014
c6b4cac
iio: st_sensors: Fix buffer copy
rvdgracht Sep 29, 2014
4748119
iio: adc: mxs-lradc: Disable the clock on probe failure
Oct 4, 2014
03045bc
iio: tsl4531: Fix compiler error when CONFIG_PM_OPS is not defined
Oct 20, 2014
25afffe
io: accel: kxcjk-1013: Fix iio_event_spec direction
Oct 10, 2014
f73cde6
iio: as3935: allocate correct iio_device size
gmccollister Oct 31, 2014
e105547
staging:iio:ade7758: Fix NULL pointer deref when enabling buffer
larsclausen Nov 4, 2014
79fa64e
staging:iio:ade7758: Fix check if channels are enabled in prenable
larsclausen Nov 4, 2014
b598aac
staging:iio:ade7758: Remove "raw" from channel name
larsclausen Nov 4, 2014
ab699bc
ARM: dts: vf610: add SD node to cosmic dts
olofj Nov 5, 2014
ac0225f
Revert "storage: Replace magic number with define in usb_stor_euscsi_…
gregkh Nov 5, 2014
4473d05
USB: cdc-acm: only raise DTR on transitions from B0
jhovold Nov 5, 2014
bce20b2
Merge tag 'iio-fixes-for-3.18b' of git://git.kernel.org/pub/scm/linux…
gregkh Nov 5, 2014
a88098b
USB: storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huaw…
M-a-r-k Nov 4, 2014
f20531a
phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
Nov 4, 2014
547039e
serial: Fix divide-by-zero fault in uart_get_divisor()
peterhurley Oct 16, 2014
37b1645
tty: Fix high cpu load if tty is unreleaseable
peterhurley Oct 16, 2014
494c1ea
tty: Prevent "read/write wait queue active!" log flooding
peterhurley Oct 16, 2014
5305e4d
dma: edma: move device registration to platform code
arndb Oct 24, 2014
cd92208
tty: serial: 8250_mtk: Fix quot calculation
mbgg Oct 9, 2014
9e326f7
tty/vt: don't set font mappings on vc not supporting this
ideak Oct 2, 2014
7e12e67
serial: of-serial: fix uninitialized kmalloc variable
Oct 21, 2014
5002921
Merge tag 'usb-serial-3.18-rc4' of git://git.kernel.org/pub/scm/linux…
gregkh Nov 6, 2014
c4dc304
tty: Fix pty master poll() after slave closes v2
Oct 10, 2014
e5452dd
Merge tag 'fixes-for-v3.18-rc4' of git://git.kernel.org/pub/scm/linux…
gregkh Nov 6, 2014
2a8cdfd
USB: cdc-acm: add quirk for control-line state requests
jhovold Nov 6, 2014
e4a60d1
sysfs: driver core: Fix glue dir race condition by gdp_mutex
YijingWang Nov 7, 2014
1910195
USB: Update default usb-storage delay_use value in kernel-parameters.txt
M-a-r-k Nov 4, 2014
9c60269
tiny: reverse logic for DISABLE_DEV_COREDUMP
aristeu Oct 16, 2014
cd3d9ea
tiny: rename ENABLE_DEV_COREDUMP to ALLOW_DEV_COREDUMP
jmberg-intel Oct 30, 2014
92c9e0c
ARM: dts: zynq: Enable PL clocks for Parallella
afaerber Nov 6, 2014
b942791
Merge tag 'usb-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Nov 9, 2014
45a4c07
Merge tag 'tty-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Nov 9, 2014
86a7a16
Merge tag 'staging-3.18-rc4' of git://git.kernel.org/pub/scm/linux/ke…
torvalds Nov 9, 2014
0b0c7db
Merge tag 'driver-core-3.18-rc4' of git://git.kernel.org/pub/scm/linu…
torvalds Nov 9, 2014
c4c23fb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…
torvalds Nov 9, 2014
a315780
Merge branch 'devicetree/merge' of git://git.kernel.org/pub/scm/linux…
torvalds Nov 9, 2014
b1f368b
Merge tag 'armsoc-for-rc4' of git://git.kernel.org/pub/scm/linux/kern…
torvalds Nov 9, 2014
ee867cf
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/…
torvalds Nov 9, 2014
206c5f6
Linux 3.18-rc4
torvalds Nov 9, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
USB: cdc-acm: add device id for GW Instek AFG-2225 
Add device-id entry for GW Instek AFG-2225, which has a byte swapped
bInterfaceSubClass (0x20).

Reported-by: Karl Palsson <[email protected]>
Cc: stable <[email protected]>
Signed-off-by: Johan Hovold <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
@jhovold @gregkh
jhovold authored and gregkh committed Nov 3, 2014
commit cf84a691a61606a2e7269907d3727e2d9fa148ee
1 change: 1 addition & 0 deletions drivers/usb/class/cdc-acm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,6 +1681,7 @@ static const struct usb_device_id acm_ids[] = {
{ USB_DEVICE(0x0572, 0x1328), /* Shiro / Aztech USB MODEM UM-3100 */
.driver_info = NO_UNION_NORMAL, /* has no union descriptor */
},
{ USB_DEVICE(0x2184, 0x001c) }, /* GW Instek AFG-2225 */
{ USB_DEVICE(0x22b8, 0x6425), /* Motorola MOTOMAGX phones */
},
/* Motorola H24 HSPA module: */
Expand Down