Merge tag 'iwlwifi-for-kalle-2015-01-05' of https://git.kernel.org/pub/scm/linux...

[karo-tx-linux.git] / drivers / usb / serial / mos7720.c

diff --git a/drivers/usb/serial/mos7720.c b/drivers/usb/serial/mos7720.c
index dfd728a263d29bbc522e20d52448c7da4c977fc9..4f70df33975a4a9bf02d3945e8b2bb956b1e7cd6 100644 (file)
--- a/drivers/usb/serial/mos7720.c
+++ b/drivers/usb/serial/mos7720.c
@@ -1299,8 +1299,6 @@ static void mos7720_throttle(struct tty_struct *tty)
                mos7720_port->shadowMCR &= ~UART_MCR_RTS;
                write_mos_reg(port->serial, port->port_number, MCR,
                              mos7720_port->shadowMCR);
-               if (status != 0)
-                       return;
        }
 }
 
@@ -1331,8 +1329,6 @@ static void mos7720_unthrottle(struct tty_struct *tty)
                mos7720_port->shadowMCR |= UART_MCR_RTS;
                write_mos_reg(port->serial, port->port_number, MCR,
                              mos7720_port->shadowMCR);
-               if (status != 0)
-                       return;
        }
 }
 
@@ -1657,7 +1653,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 +1698,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);
        }