diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-29 13:13:41 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2020-10-29 13:13:41 +1100 |
| commit | 94451c280117e79c76912fc8836eefedaecfc21f (patch) | |
| tree | fab9d7d72cd2319ed0532ef494a2aeed77eec447 | |
| parent | 57ecf48b425c8933e3298f2e651747706b623781 (diff) | |
| parent | d1849b9ff9f442b3720e07b2d6f6c5cf1b97b1a3 (diff) | |
Merge remote-tracking branch 'usb-serial/usb-next' into master
| -rw-r--r-- | drivers/usb/serial/digi_acceleport.c | 5 | ||||
| -rw-r--r-- | drivers/usb/serial/iuu_phoenix.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/drivers/usb/serial/digi_acceleport.c b/drivers/usb/serial/digi_acceleport.c index 91055a191995..016e7dec3196 100644 --- a/drivers/usb/serial/digi_acceleport.c +++ b/drivers/usb/serial/digi_acceleport.c @@ -911,9 +911,8 @@ static int digi_write(struct tty_struct *tty, struct usb_serial_port *port, unsigned char *data = port->write_urb->transfer_buffer; unsigned long flags = 0; - dev_dbg(&port->dev, - "digi_write: TOP: port=%d, count=%d, in_interrupt=%ld\n", - priv->dp_port_num, count, in_interrupt()); + dev_dbg(&port->dev, "digi_write: TOP: port=%d, count=%d\n", + priv->dp_port_num, count); /* copy user data (which can sleep) before getting spin lock */ count = min(count, port->bulk_out_size-2); diff --git a/drivers/usb/serial/iuu_phoenix.c b/drivers/usb/serial/iuu_phoenix.c index b4ba79123d9d..f1201d4de297 100644 --- a/drivers/usb/serial/iuu_phoenix.c +++ b/drivers/usb/serial/iuu_phoenix.c @@ -850,7 +850,6 @@ static int iuu_uart_baud(struct usb_serial_port *port, u32 baud_base, default: kfree(dataout); return IUU_INVALID_PARAMETER; - break; } switch (parity & 0xF0) { @@ -864,7 +863,6 @@ static int iuu_uart_baud(struct usb_serial_port *port, u32 baud_base, default: kfree(dataout); return IUU_INVALID_PARAMETER; - break; } status = bulk_immediate(port, dataout, DataCount); |