diff options
| author | Johan Hovold <johan@kernel.org> | 2014-10-29 09:07:33 +0100 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-11-03 09:15:17 +0100 |
| commit | 1dbd11be69927d2d119e900f5487a01ad09a26b8 (patch) | |
| tree | 4ed7afefbfb93bb172f44c5ab75514fea5e23ea9 /drivers/usb | |
| parent | 811c37078042980b5b9ed6845303a3cc9e6d48e3 (diff) | |
| download | blackbird-op-linux-1dbd11be69927d2d119e900f5487a01ad09a26b8.tar.gz blackbird-op-linux-1dbd11be69927d2d119e900f5487a01ad09a26b8.zip | |
USB: mos7720: 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/mos7720.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c index dfd728a263d2..312b0fee8d54 100644 --- a/drivers/usb/serial/mos7720.c +++ b/drivers/usb/serial/mos7720.c @@ -1657,7 +1657,7 @@ static void change_port_settings(struct tty_struct *tty, write_mos_reg(serial, port_number, IER, 0x0c); if (port->read_urb->status != -EINPROGRESS) { - status = usb_submit_urb(port->read_urb, GFP_ATOMIC); + status = usb_submit_urb(port->read_urb, GFP_KERNEL); if (status) dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", status); } @@ -1702,7 +1702,7 @@ static void mos7720_set_termios(struct tty_struct *tty, change_port_settings(tty, mos7720_port, old_termios); if (port->read_urb->status != -EINPROGRESS) { - status = usb_submit_urb(port->read_urb, GFP_ATOMIC); + status = usb_submit_urb(port->read_urb, GFP_KERNEL); if (status) dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", status); } |
