Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / drivers / usb / serial / cyberjack.c

diff --git a/drivers/usb/serial/cyberjack.c b/drivers/usb/serial/cyberjack.c
index 299daca..9ca40ac 100644 (file)
--- a/drivers/usb/serial/cyberjack.c
+++ b/drivers/usb/serial/cyberjack.c
@@ -109,7 +109,7 @@ struct cyberjack_private {
        short           rdtodo;         /* Bytes still to read */
        unsigned char   wrbuf[5*64];    /* Buffer for collecting data to write */
        short           wrfilled;       /* Overall data size we already got */
-       short           wrsent;         /* Data akready sent */
+       short           wrsent;         /* Data already sent */
 };
 
 /* do some startup allocations not currently performed by usb_serial_probe() */
@@ -159,8 +159,6 @@ static int  cyberjack_open (struct usb_serial_port *port, struct file *filp)
 
        dbg("%s - usb_clear_halt", __FUNCTION__ );
        usb_clear_halt(port->serial->dev, port->write_urb->pipe);
-       usb_clear_halt(port->serial->dev, port->read_urb->pipe);
-       usb_clear_halt(port->serial->dev, port->interrupt_in_urb->pipe);
 
        /* force low_latency on so that our tty_push actually forces
         * the data through, otherwise it is scheduled, and with high
@@ -212,7 +210,6 @@ static int cyberjack_write (struct usb_serial_port *port, int from_user, const u
        unsigned long flags;
        int result;
        int wrexpected;
-       unsigned char localbuf[CYBERJACK_LOCAL_BUF_SIZE];       /* Buffer for collecting data to write */
 
        dbg("%s - port %d", __FUNCTION__, port->number);
        dbg("%s - from_user %d", __FUNCTION__, from_user);
@@ -229,29 +226,23 @@ static int cyberjack_write (struct usb_serial_port *port, int from_user, const u
 
        spin_lock_irqsave(&priv->lock, flags);
 
-       if( (count+priv->wrfilled)>sizeof(priv->wrbuf) ||
-               (count>sizeof(localbuf)) ) {
-               /* To much data  for buffer. Reset buffer. */
+       if( (count+priv->wrfilled)>sizeof(priv->wrbuf) ) {
+               /* To much data for buffer. Reset buffer. */
                priv->wrfilled=0;
                spin_unlock_irqrestore(&priv->lock, flags);
                return (0);
        }
 
-       spin_unlock_irqrestore(&priv->lock, flags);
-
        /* Copy data */
        if (from_user) {
-               if (copy_from_user(localbuf, buf, count)) {
+               if (copy_from_user(priv->wrbuf+priv->wrfilled, buf, count)) {
+                       spin_unlock_irqrestore(&priv->lock, flags);
                        return -EFAULT;
                }
        } else {
-               memcpy (localbuf, buf, count);
+               memcpy (priv->wrbuf+priv->wrfilled, buf, count);
        }  
 
-       spin_lock_irqsave(&priv->lock, flags);
-
-       memcpy (priv->wrbuf+priv->wrfilled, localbuf, count);
-
        usb_serial_debug_data (__FILE__, __FUNCTION__, count,
                priv->wrbuf+priv->wrfilled);
        priv->wrfilled += count;