diff options
author | Johan Hovold <johan@kernel.org> | 2014-10-29 09:07:34 +0100 |
---|---|---|
committer | Johan Hovold <johan@kernel.org> | 2014-11-03 09:15:18 +0100 |
commit | 9d3801903851a2be51f0b2d85f25f952a7da9969 (patch) | |
tree | 2044ee94c5b693c8e5b7d4cb98a14fa62aa666f2 /drivers/usb | |
parent | 1dbd11be69927d2d119e900f5487a01ad09a26b8 (diff) | |
download | linux-stable-9d3801903851a2be51f0b2d85f25f952a7da9969.tar.gz linux-stable-9d3801903851a2be51f0b2d85f25f952a7da9969.tar.bz2 linux-stable-9d3801903851a2be51f0b2d85f25f952a7da9969.zip |
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>
Diffstat (limited to 'drivers/usb')
-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 3d88eefdf1d1..220b4be89641 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); |