USB: serial: cypress_m8: fix interrupt-out transfer length

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / usb / serial / cypress_m8.c

diff --git a/drivers/usb/serial/cypress_m8.c b/drivers/usb/serial/cypress_m8.c
index bccb122..e92cd1e 100644 (file)
--- a/drivers/usb/serial/cypress_m8.c
+++ b/drivers/usb/serial/cypress_m8.c
@@ -279,7 +279,7 @@ static int analyze_baud_rate(struct usb_serial_port *port, speed_t new_rate)
                         * the generic firmware, but are not used with
                         * NMEA and SiRF protocols */
                        dev_dbg(&port->dev,
-                               "%s - failed setting baud rate, unsupported speed of %d on Earthmate GPS",
+                               "%s - failed setting baud rate, unsupported speed of %d on Earthmate GPS\n",
                                __func__, new_rate);
                        return -1;
                }
@@ -447,6 +447,11 @@ static int cypress_generic_port_probe(struct usb_serial_port *port)
        struct usb_serial *serial = port->serial;
        struct cypress_private *priv;
 
+       if (!port->interrupt_out_urb || !port->interrupt_in_urb) {
+               dev_err(&port->dev, "required endpoint is missing\n");
+               return -ENODEV;
+       }
+
        priv = kzalloc(sizeof(struct cypress_private), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
@@ -606,12 +611,6 @@ static int cypress_open(struct tty_struct *tty, struct usb_serial_port *port)
                cypress_set_termios(tty, port, &priv->tmp_termios);
 
        /* setup the port and start reading from the device */
-       if (!port->interrupt_in_urb) {
-               dev_err(&port->dev, "%s - interrupt_in_urb is empty!\n",
-                       __func__);
-               return -1;
-       }
-
        usb_fill_int_urb(port->interrupt_in_urb, serial->dev,
                usb_rcvintpipe(serial->dev, port->interrupt_in_endpointAddress),
                port->interrupt_in_urb->transfer_buffer,
@@ -774,7 +773,7 @@ send:
 
        usb_fill_int_urb(port->interrupt_out_urb, port->serial->dev,
                usb_sndintpipe(port->serial->dev, port->interrupt_out_endpointAddress),
-               port->interrupt_out_buffer, port->interrupt_out_size,
+               port->interrupt_out_buffer, actual_size,
                cypress_write_int_callback, port, priv->write_urb_interval);
        result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC);
        if (result) {
@@ -1224,7 +1223,6 @@ static void cypress_write_int_callback(struct urb *urb)
        struct usb_serial_port *port = urb->context;
        struct cypress_private *priv = usb_get_serial_port_data(port);
        struct device *dev = &urb->dev->dev;
-       int result;
        int status = urb->status;
 
        switch (status) {
@@ -1239,21 +1237,9 @@ static void cypress_write_int_callback(struct urb *urb)
                        __func__, status);
                priv->write_urb_in_use = 0;
                return;
-       case -EPIPE: /* no break needed; clear halt and resubmit */
-               if (!priv->comm_is_ok)
-                       break;
-               usb_clear_halt(port->serial->dev, 0x02);
-               /* error in the urb, so we have to resubmit it */
-               dev_dbg(dev, "%s - nonzero write bulk status received: %d\n",
-                       __func__, status);
-               port->interrupt_out_urb->transfer_buffer_length = 1;
-               result = usb_submit_urb(port->interrupt_out_urb, GFP_ATOMIC);
-               if (!result)
-                       return;
-               dev_err(dev, "%s - failed resubmitting write urb, error %d\n",
-                       __func__, result);
-               cypress_set_dead(port);
-               break;
+       case -EPIPE:
+               /* Cannot call usb_clear_halt while in_interrupt */
+               /* FALLTHROUGH */
        default:
                dev_err(dev, "%s - unexpected nonzero write status received: %d\n",
                        __func__, status);