diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 18:41:46 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 18:41:46 (GMT) |
| commit | 9f10adc54450e246bbbb63cd152a941873068567 (patch) | |
| tree | 87a70488a65c767d6af2da28b00995273a53acc1 /drivers/usb/serial/mos7840.c | |
| parent | 6629467ba5502cac22d31950e207a0334f2a0de5 (diff) | |
| parent | e7181d005e84b15fe3121a8d22840adc3395d496 (diff) | |
| download | linux-9f10adc54450e246bbbb63cd152a941873068567.tar.xz | |
Merge tag 'usb-serial-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-next
Johan writes:
USB-serial updates for v3.19-rc1
These changes add a new "simple" driver for Google USB-serial
devices and add support for Huawei Gobi modems to qcserial.
Included are also some removals of unnecessary atomic allocations and
a few spelling fixes.
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 3d88eef..220b4be 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -1904,7 +1904,7 @@ static void mos7840_change_port_settings(struct tty_struct *tty, if (mos7840_port->read_urb_busy == false) { mos7840_port->read_urb_busy = true; - status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC); + status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL); if (status) { dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", status); @@ -1968,7 +1968,7 @@ static void mos7840_set_termios(struct tty_struct *tty, if (mos7840_port->read_urb_busy == false) { mos7840_port->read_urb_busy = true; - status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC); + status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL); if (status) { dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", status); |