1 files changed, 17 insertions, 19 deletions

diff --git a/drivers/usb/serial/oti6858.c b/drivers/usb/serial/oti6858.c
index c644e26394b4..deeacdea05db 100644
--- a/drivers/usb/serial/oti6858.c
+++ b/drivers/usb/serial/oti6858.c
@@ -58,7 +58,7 @@
 #define OTI6858_AUTHOR "Tomasz Michal Lukaszewski <FIXME@FIXME>"
 #define OTI6858_VERSION "0.1"
 
-static struct usb_device_id id_table [] = {
+static const struct usb_device_id id_table[] = {
         { USB_DEVICE(OTI6858_VENDOR_ID, OTI6858_PRODUCT_ID) },
         { }
 };
@@ -302,7 +302,7 @@ void send_data(struct work_struct *work)
         struct usb_serial_port *port = priv->port;
         int count = 0, result;
         unsigned long flags;
-        unsigned char allow;
+        u8 *allow;
 
         dbg("%s(port = %d)", __func__, port->number);
 
@@ -321,13 +321,20 @@ void send_data(struct work_struct *work)
                 count = port->bulk_out_size;
 
         if (count != 0) {
+                allow = kmalloc(1, GFP_KERNEL);
+                if (!allow) {
+                        dev_err(&port->dev, "%s(): kmalloc failed\n",
+                                        __func__);
+                        return;
+                }
                 result = usb_control_msg(port->serial->dev,
                                 usb_rcvctrlpipe(port->serial->dev, 0),
                                 OTI6858_REQ_T_CHECK_TXBUFF,
                                 OTI6858_REQ_CHECK_TXBUFF,
-                                count, 0, &allow, 1, 100);
-                if (result != 1 || allow != 0)
+                                count, 0, allow, 1, 100);
+                if (result != 1 || *allow != 0)
                         count = 0;
+                kfree(allow);
         }
 
         if (count == 0) {
@@ -578,9 +585,6 @@ static int oti6858_open(struct tty_struct *tty, struct usb_serial_port *port)
         usb_clear_halt(serial->dev, port->write_urb->pipe);
         usb_clear_halt(serial->dev, port->read_urb->pipe);
 
-        if (port->port.count != 1)
-                return 0;
-
         buf = kmalloc(OTI6858_CTRL_PKT_SIZE, GFP_KERNEL);
         if (buf == NULL) {
                 dev_err(&port->dev, "%s(): out of memory!\n", __func__);
@@ -927,10 +931,6 @@ static void oti6858_read_bulk_callback(struct urb *urb)
         spin_unlock_irqrestore(&priv->lock, flags);
 
         if (status != 0) {
-                if (!port->port.count) {
-                        dbg("%s(): port is closed, exiting", __func__);
-                        return;
-                }
                 /*
                 if (status == -EPROTO) {
                         * PL2303 mysteriously fails with -EPROTO reschedule
@@ -954,14 +954,12 @@ static void oti6858_read_bulk_callback(struct urb *urb)
         }
         tty_kref_put(tty);
 
-        /* schedule the interrupt urb if we are still open */
-        if (port->port.count != 0) {
-                port->interrupt_in_urb->dev = port->serial->dev;
-                result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
-                if (result != 0) {
-                        dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
-                                        " error %d\n", __func__, result);
-                }
+        /* schedule the interrupt urb */
+        port->interrupt_in_urb->dev = port->serial->dev;
+        result = usb_submit_urb(port->interrupt_in_urb, GFP_ATOMIC);
+        if (result != 0 && result != -EPERM) {
+                dev_err(&port->dev, "%s(): usb_submit_urb() failed,"
+                                " error %d\n", __func__, result);
         }
 }