summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorOliver Neukum <oliver@neukum.org>2009-10-01 15:01:17 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-10-09 13:52:08 -0700
commita5f6005d7b1821d2085d9749b56500a8f2610924 (patch)
tree7cdb5a265c34ce1197682057e6bb18bf6aed4089 /drivers/usb
parent4c9fde9b860ccb27a7b026844eb3ef64c77e5a49 (diff)
downloadlinux-a5f6005d7b1821d2085d9749b56500a8f2610924.tar.gz
linux-a5f6005d7b1821d2085d9749b56500a8f2610924.tar.bz2
linux-a5f6005d7b1821d2085d9749b56500a8f2610924.zip
USB: small fix in error case of suspend in generic usbserial code
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>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/serial/usb-serial.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c
index 2d0f75d63ff0..bd3fa7ff15b1 100644
--- a/drivers/usb/serial/usb-serial.c
+++ b/drivers/usb/serial/usb-serial.c
@@ -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) {