diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-09 05:28:19 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-09 05:28:19 +0100 |
| commit | ce53bfc4374cada8b645765e2b4ad5831e760932 (patch) | |
| tree | 30c9c7a00e457f1d9c4d65ac615d1e846e00abf3 /drivers/usb/serial/mos7840.c | |
| parent | Merge tag 'phy-for-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/kish... (diff) | |
| parent | USB: serial: cp210x: add new access functions for large registers (diff) | |
| download | linux-ce53bfc4374cada8b645765e2b4ad5831e760932.tar.xz linux-ce53bfc4374cada8b645765e2b4ad5831e760932.zip | |
Merge tag 'usb-serial-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for v4.6-rc1
Here are some cp210x register-accessor updates and general usb-serial
code clean ups.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
| -rw-r--r-- | drivers/usb/serial/mos7840.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 2c69bfcdacc6..8ddc3130511f 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -1842,7 +1842,7 @@ static void mos7840_change_port_settings(struct tty_struct *tty, Data = 0x0c; mos7840_set_uart_reg(port, INTERRUPT_ENABLE_REGISTER, Data); - if (mos7840_port->read_urb_busy == false) { + if (!mos7840_port->read_urb_busy) { mos7840_port->read_urb_busy = true; status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL); if (status) { @@ -1906,7 +1906,7 @@ static void mos7840_set_termios(struct tty_struct *tty, return; } - if (mos7840_port->read_urb_busy == false) { + if (!mos7840_port->read_urb_busy) { mos7840_port->read_urb_busy = true; status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL); if (status) { |