diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-20 21:47:15 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-20 21:47:15 +0200 |
| commit | 78fbe864c32ce90e81f95f3a0f388a2aa40d55d2 (patch) | |
| tree | c068743057aef20691b60c21d4834dbfef34edc7 /drivers/usb/serial/mos7840.c | |
| parent | 500f0716b5f7fd6b0ff3d045588c7588ce2eee1d (diff) | |
| parent | c8acfe0aadbeb78f65826959891be15cc0a709a3 (diff) | |
| download | talos-obmc-linux-78fbe864c32ce90e81f95f3a0f388a2aa40d55d2.tar.gz talos-obmc-linux-78fbe864c32ce90e81f95f3a0f388a2aa40d55d2.zip | |
Merge tag 'usb-serial-4.19-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for v4.19-rc1
Here are the USB-serial updates for 4.19-rc1, including:
- gpio support for CP2102N devices
- improved line-speed handling for cp210x
- conversion to spin_lock_irqsave() in completion handlers
- dropped kl5kusb105 support from the kl5kusb105 driver (sic!)
Included are also various lower-priority fixes and clean ups.
All but the final commit have been in linux-next, and with no reported
issues.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
| -rw-r--r-- | drivers/usb/serial/mos7840.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index b580b4c7fa48..b42bad85097a 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -805,18 +805,19 @@ static void mos7840_bulk_out_data_callback(struct urb *urb) struct moschip_port *mos7840_port; struct usb_serial_port *port; int status = urb->status; + unsigned long flags; int i; mos7840_port = urb->context; port = mos7840_port->port; - spin_lock(&mos7840_port->pool_lock); + spin_lock_irqsave(&mos7840_port->pool_lock, flags); for (i = 0; i < NUM_URBS; i++) { if (urb == mos7840_port->write_urb_pool[i]) { mos7840_port->busy[i] = 0; break; } } - spin_unlock(&mos7840_port->pool_lock); + spin_unlock_irqrestore(&mos7840_port->pool_lock, flags); if (status) { dev_dbg(&port->dev, "nonzero write bulk status received:%d\n", status); |
