summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial/kobil_sct.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2014-11-26 19:41:46 +0100
committerGreg Kroah-Hartman2014-11-26 19:41:46 +0100
commit9f10adc54450e246bbbb63cd152a941873068567 (patch)
tree87a70488a65c767d6af2da28b00995273a53acc1 /drivers/usb/serial/kobil_sct.c
parentusb: chipidea: Fixed a few typos in comments (diff)
parentUSB: qcserial: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem (diff)
downloadkernel-qcow2-linux-9f10adc54450e246bbbb63cd152a941873068567.tar.gz
kernel-qcow2-linux-9f10adc54450e246bbbb63cd152a941873068567.tar.xz
kernel-qcow2-linux-9f10adc54450e246bbbb63cd152a941873068567.zip
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.c2
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);
}