Skip to content

Commit 0fa84af

Browse files
committed
Merge tag 'usb-serial-5.7-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes: USB-serial updates for 5.7-rc1 Here are the USB-serial updates for 5.7-rc1, including: - support for a new family of Fintek devices - fix for an io-edgeport slab-out-of-bounds access - fixes for a couple of kernel-doc issues Included are also various clean ups and some new modem device ids. All but the io-edgeport fix have been in linux-next with no reported issues. * tag 'usb-serial-5.7-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial: USB: serial: io_edgeport: fix slab-out-of-bounds read in edge_interrupt_callback USB: serial: option: add Wistron Neweb D19Q1 USB: serial: option: add BroadMobi BM806U USB: serial: option: add support for ASKEY WWHC050 USB: serial: f81232: add control driver for F81534A USB: serial: fix tty cleanup-op kernel-doc USB: serial: clean up carrier-detect helper USB: serial: f81232: set F81534A serial port with RS232 mode USB: serial: f81232: add F81534A support USB: serial: f81232: use devm_kzalloc for port data USB: serial: f81232: add tx_empty function USB: serial: f81232: extract LSR handler USB: serial: digi_acceleport: remove redundant assignment to pointer priv USB: serial: relax unthrottle memory barrier
2 parents a599a0f + 57aa9f2 commit 0fa84af

File tree

6 files changed

+332
-46
lines changed

6 files changed

+332
-46
lines changed

drivers/usb/serial/digi_acceleport.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1472,7 +1472,7 @@ static int digi_read_oob_callback(struct urb *urb)
14721472
struct usb_serial_port *port = urb->context;
14731473
struct usb_serial *serial = port->serial;
14741474
struct tty_struct *tty;
1475-
struct digi_port *priv = usb_get_serial_port_data(port);
1475+
struct digi_port *priv;
14761476
unsigned char *buf = urb->transfer_buffer;
14771477
int opcode, line, status, val;
14781478
unsigned long flags;

0 commit comments

Comments
 (0)