aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2014-10-29 04:07:34 -0400
committerJohan Hovold <johan@kernel.org>2014-11-03 03:15:18 -0500
commit9d3801903851a2be51f0b2d85f25f952a7da9969 (patch)
tree2044ee94c5b693c8e5b7d4cb98a14fa62aa666f2
parent1dbd11be69927d2d119e900f5487a01ad09a26b8 (diff)
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>
-rw-r--r--drivers/usb/serial/mos7840.c4
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,
1904 1904
1905 if (mos7840_port->read_urb_busy == false) { 1905 if (mos7840_port->read_urb_busy == false) {
1906 mos7840_port->read_urb_busy = true; 1906 mos7840_port->read_urb_busy = true;
1907 status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC); 1907 status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL);
1908 if (status) { 1908 if (status) {
1909 dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", 1909 dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n",
1910 status); 1910 status);
@@ -1968,7 +1968,7 @@ static void mos7840_set_termios(struct tty_struct *tty,
1968 1968
1969 if (mos7840_port->read_urb_busy == false) { 1969 if (mos7840_port->read_urb_busy == false) {
1970 mos7840_port->read_urb_busy = true; 1970 mos7840_port->read_urb_busy = true;
1971 status = usb_submit_urb(mos7840_port->read_urb, GFP_ATOMIC); 1971 status = usb_submit_urb(mos7840_port->read_urb, GFP_KERNEL);
1972 if (status) { 1972 if (status) {
1973 dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n", 1973 dev_dbg(&port->dev, "usb_submit_urb(read bulk) failed, status = %d\n",
1974 status); 1974 status);