USB: serial: option: add WeTelecom WM-D200

[pandora-kernel.git] / drivers / usb / serial / usb_wwan.c

diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c
index d555ca9..b38994e 100644 (file)
--- a/drivers/usb/serial/usb_wwan.c
+++ b/drivers/usb/serial/usb_wwan.c
@@ -41,7 +41,6 @@ static int debug;
 
 void usb_wwan_dtr_rts(struct usb_serial_port *port, int on)
 {
-       struct usb_serial *serial = port->serial;
        struct usb_wwan_port_private *portdata;
 
        struct usb_wwan_intf_private *intfdata;
@@ -54,12 +53,11 @@ void usb_wwan_dtr_rts(struct usb_serial_port *port, int on)
                return;
 
        portdata = usb_get_serial_port_data(port);
-       mutex_lock(&serial->disc_mutex);
+       /* FIXME: locking */
        portdata->rts_state = on;
        portdata->dtr_state = on;
-       if (serial->dev)
-               intfdata->send_setup(port);
-       mutex_unlock(&serial->disc_mutex);
+
+       intfdata->send_setup(port);
 }
 EXPORT_SYMBOL(usb_wwan_dtr_rts);
 
@@ -238,8 +236,10 @@ int usb_wwan_write(struct tty_struct *tty, struct usb_serial_port *port,
                    usb_pipeendpoint(this_urb->pipe), i);
 
                err = usb_autopm_get_interface_async(port->serial->interface);
-               if (err < 0)
+               if (err < 0) {
+                       clear_bit(i, &portdata->out_busy);
                        break;
+               }
 
                /* send the data */
                memcpy(this_urb->transfer_buffer, buf, todo);
@@ -434,12 +434,26 @@ int usb_wwan_open(struct tty_struct *tty, struct usb_serial_port *port)
 }
 EXPORT_SYMBOL(usb_wwan_open);
 
+static void unbusy_queued_urb(struct urb *urb,
+                                       struct usb_wwan_port_private *portdata)
+{
+       int i;
+
+       for (i = 0; i < N_OUT_URB; i++) {
+               if (urb == portdata->out_urbs[i]) {
+                       clear_bit(i, &portdata->out_busy);
+                       break;
+               }
+       }
+}
+
 void usb_wwan_close(struct usb_serial_port *port)
 {
        int i;
        struct usb_serial *serial = port->serial;
        struct usb_wwan_port_private *portdata;
        struct usb_wwan_intf_private *intfdata = port->serial->private;
+       struct urb *urb;
 
        dbg("%s", __func__);
        portdata = usb_get_serial_port_data(port);
@@ -450,6 +464,14 @@ void usb_wwan_close(struct usb_serial_port *port)
                portdata->opened = 0;
                spin_unlock_irq(&intfdata->susp_lock);
 
+               for (;;) {
+                       urb = usb_get_from_anchor(&portdata->delayed);
+                       if (!urb)
+                               break;
+                       unbusy_queued_urb(urb, portdata);
+                       usb_autopm_put_interface_async(serial->interface);
+               }
+
                for (i = 0; i < N_IN_URB; i++)
                        usb_kill_urb(portdata->in_urbs[i]);
                for (i = 0; i < N_OUT_URB; i++)
@@ -647,46 +669,31 @@ EXPORT_SYMBOL(usb_wwan_release);
 int usb_wwan_suspend(struct usb_serial *serial, pm_message_t message)
 {
        struct usb_wwan_intf_private *intfdata = serial->private;
-       int b;
 
        dbg("%s entered", __func__);
 
+       spin_lock_irq(&intfdata->susp_lock);
        if (PMSG_IS_AUTO(message)) {
-               spin_lock_irq(&intfdata->susp_lock);
-               b = intfdata->in_flight;
-               spin_unlock_irq(&intfdata->susp_lock);
-
-               if (b)
+               if (intfdata->in_flight) {
+                       spin_unlock_irq(&intfdata->susp_lock);
                        return -EBUSY;
+               }
        }
-
-       spin_lock_irq(&intfdata->susp_lock);
        intfdata->suspended = 1;
        spin_unlock_irq(&intfdata->susp_lock);
+
        stop_read_write_urbs(serial);
 
        return 0;
 }
 EXPORT_SYMBOL(usb_wwan_suspend);
 
-static void unbusy_queued_urb(struct urb *urb, struct usb_wwan_port_private *portdata)
-{
-       int i;
-
-       for (i = 0; i < N_OUT_URB; i++) {
-               if (urb == portdata->out_urbs[i]) {
-                       clear_bit(i, &portdata->out_busy);
-                       break;
-               }
-       }
-}
-
-static void play_delayed(struct usb_serial_port *port)
+static int play_delayed(struct usb_serial_port *port)
 {
        struct usb_wwan_intf_private *data;
        struct usb_wwan_port_private *portdata;
        struct urb *urb;
-       int err;
+       int err = 0;
 
        portdata = usb_get_serial_port_data(port);
        data = port->serial->private;
@@ -703,6 +710,8 @@ static void play_delayed(struct usb_serial_port *port)
                        break;
                }
        }
+
+       return err;
 }
 
 int usb_wwan_resume(struct usb_serial *serial)
@@ -712,7 +721,8 @@ int usb_wwan_resume(struct usb_serial *serial)
        struct usb_wwan_intf_private *intfdata = serial->private;
        struct usb_wwan_port_private *portdata;
        struct urb *urb;
-       int err = 0;
+       int err;
+       int err_count = 0;
 
        dbg("%s entered", __func__);
        /* get the interrupt URBs resubmitted unconditionally */
@@ -727,21 +737,23 @@ int usb_wwan_resume(struct usb_serial *serial)
                if (err < 0) {
                        err("%s: Error %d for interrupt URB of port%d",
                            __func__, err, i);
-                       goto err_out;
+                       err_count++;
                }
        }
 
+       spin_lock_irq(&intfdata->susp_lock);
        for (i = 0; i < serial->num_ports; i++) {
                /* walk all ports */
                port = serial->port[i];
                portdata = usb_get_serial_port_data(port);
 
                /* skip closed ports */
-               spin_lock_irq(&intfdata->susp_lock);
-               if (!portdata->opened) {
-                       spin_unlock_irq(&intfdata->susp_lock);
+               if (!portdata->opened)
                        continue;
-               }
+
+               err = play_delayed(port);
+               if (err)
+                       err_count++;
 
                for (j = 0; j < N_IN_URB; j++) {
                        urb = portdata->in_urbs[j];
@@ -749,18 +761,17 @@ int usb_wwan_resume(struct usb_serial *serial)
                        if (err < 0) {
                                err("%s: Error %d for bulk URB %d",
                                    __func__, err, i);
-                               spin_unlock_irq(&intfdata->susp_lock);
-                               goto err_out;
+                               err_count++;
                        }
                }
-               play_delayed(port);
-               spin_unlock_irq(&intfdata->susp_lock);
        }
-       spin_lock_irq(&intfdata->susp_lock);
        intfdata->suspended = 0;
        spin_unlock_irq(&intfdata->susp_lock);
-err_out:
-       return err;
+
+       if (err_count)
+               return -EIO;
+
+       return 0;
 }
 EXPORT_SYMBOL(usb_wwan_resume);
 #endif