openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

USB: mos7840: replace unnecessary atomic allocations 

Use GFP_KERNEL instead of GFP_ATOMIC for allocations in set_termios and
port-setting helper which both may and do sleep.

Signed-off-by: Johan Hovold <johan@kernel.org>
This commit is contained in:
Johan Hovold 2014-10-29 09:07:34 +01:00
parent 1dbd11be69
commit 9d38019038
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/usb/serial/mos7840.c
View File

@ -1904,7 +1904,7 @@ static void mos7840_change_port_settings(struct tty_struct *tty,
if (mos7840_port->read_urb_busy == false) { if (mos7840_port->read_urb_busy == false) {
mos7840_port->read_urb_busy = true; 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) { if (status) {
dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n",
status); status);
@ -1968,7 +1968,7 @@ static void mos7840_set_termios(struct tty_struct *tty,
if (mos7840_port->read_urb_busy == false) { if (mos7840_port->read_urb_busy == false) {
mos7840_port->read_urb_busy = true; 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) { if (status) {
dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n",
status); status);