diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 10:41:46 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-11-26 10:41:46 -0800 |
| commit | 9f10adc54450e246bbbb63cd152a941873068567 (patch) | |
| tree | 87a70488a65c767d6af2da28b00995273a53acc1 /drivers/usb/serial/kobil_sct.c | |
| parent | 6629467ba5502cac22d31950e207a0334f2a0de5 (diff) | |
| parent | e7181d005e84b15fe3121a8d22840adc3395d496 (diff) | |
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/kobil_sct.c')
| -rw-r--r-- | drivers/usb/serial/kobil_sct.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/serial/kobil_sct.c b/drivers/usb/serial/kobil_sct.c index 02c420af251e..2363654cafc9 100644 --- a/drivers/usb/serial/kobil_sct.c +++ b/drivers/usb/serial/kobil_sct.c @@ -244,7 +244,7 @@ static int kobil_open(struct tty_struct *tty, struct usb_serial_port *port) priv->device_type == KOBIL_ADAPTER_B_PRODUCT_ID || priv->device_type == KOBIL_KAAN_SIM_PRODUCT_ID) { /* start reading (Adapter B 'cause PNP string) */ - result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC); + result = usb_submit_urb(port->interrupt_in_urb, GFP_KERNEL); dev_dbg(dev, "%s - Send read URB returns: %i\n", __func__, result); } |