USB: sierra: fix remote wakeup

commit 80cc0fcbdaeaf10d04ba27779a2d7ceb73d2717a upstream.

Make sure that needs_remote_wake up is always set when there are open
ports.

Currently close() would unconditionally set needs_remote_wakeup to 0
even though there might still be open ports. This could lead to blocked
input and possibly dropped data on devices that do not support remote
wakeup (and which must therefore not be runtime suspended while open).

Add an open_ports counter (protected by the susp_lock) and only clear
needs_remote_wakeup when the last port is closed.

Fixes: e6929a9020ac ("USB: support for autosuspend in sierra while
online")

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[bwh: Backported to 3.2: adjust indentation]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c
index bed69cc..0d26ab6 100644 (file)
--- a/drivers/usb/serial/sierra.c
+++ b/drivers/usb/serial/sierra.c
@@ -59,6 +59,7 @@ struct sierra_intf_private {
        spinlock_t susp_lock;
        unsigned int suspended:1;
        int in_flight;
+       unsigned int open_ports;
 };
 
 static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
@@ -814,7 +815,6 @@ static void sierra_close(struct usb_serial_port *port)
        if (serial->dev) {
                mutex_lock(&serial->disc_mutex);
                if (!serial->disconnected) {
-                       serial->interface->needs_remote_wakeup = 0;
                        /* odd error handling due to pm counters */
                        if (!usb_autopm_get_interface(serial->interface))
                                sierra_send_setup(port);
@@ -825,6 +825,8 @@ static void sierra_close(struct usb_serial_port *port)
                mutex_unlock(&serial->disc_mutex);
                spin_lock_irq(&intfdata->susp_lock);
                portdata->opened = 0;
+               if (--intfdata->open_ports == 0)
+                       serial->interface->needs_remote_wakeup = 0;
                spin_unlock_irq(&intfdata->susp_lock);
 
                for (;;) {
@@ -885,9 +887,10 @@ static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
 
        sierra_send_setup(port);
 
-       serial->interface->needs_remote_wakeup = 1;
        spin_lock_irq(&intfdata->susp_lock);
        portdata->opened = 1;
+       if (++intfdata->open_ports == 1)
+               serial->interface->needs_remote_wakeup = 1;
        spin_unlock_irq(&intfdata->susp_lock);
        usb_autopm_put_interface(serial->interface);