]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
USB: small fix in error case of suspend in generic usbserial code
authorOliver Neukum <oliver@neukum.org>
Thu, 1 Oct 2009 13:01:17 +0000 (15:01 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 9 Oct 2009 20:52:08 +0000 (13:52 -0700)
usb:usbserial: fix flags in error case of suspension

suspended flag must be reset in error case

Signed-off-by: Oliver Neukum <oliver@neukum.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/usb/serial/usb-serial.c

index 2d0f75d63ff0c482b45882d6e8769efb02cde6c4..bd3fa7ff15b12166bf0cf2ad86f3214144f914c0 100644 (file)
@@ -1168,8 +1168,10 @@ int usb_serial_suspend(struct usb_interface *intf, pm_message_t message)
 
        if (serial->type->suspend) {
                r = serial->type->suspend(serial, message);
-               if (r < 0)
+               if (r < 0) {
+                       serial->suspending = 0;
                        goto err_out;
+               }
        }
 
        for (i = 0; i < serial->num_ports; ++i) {