diff options
author | Oliver Neukum <oliver@neukum.org> | 2009-10-01 09:01:17 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-09 16:52:08 -0400 |
commit | a5f6005d7b1821d2085d9749b56500a8f2610924 (patch) | |
tree | 7cdb5a265c34ce1197682057e6bb18bf6aed4089 /drivers/usb/serial/usb-serial.c | |
parent | 4c9fde9b860ccb27a7b026844eb3ef64c77e5a49 (diff) |
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/serial/usb-serial.c')
-rw-r--r-- | drivers/usb/serial/usb-serial.c | 4 |
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) | |||
1168 | 1168 | ||
1169 | if (serial->type->suspend) { | 1169 | if (serial->type->suspend) { |
1170 | r = serial->type->suspend(serial, message); | 1170 | r = serial->type->suspend(serial, message); |
1171 | if (r < 0) | 1171 | if (r < 0) { |
1172 | serial->suspending = 0; | ||
1172 | goto err_out; | 1173 | goto err_out; |
1174 | } | ||
1173 | } | 1175 | } |
1174 | 1176 | ||
1175 | for (i = 0; i < serial->num_ports; ++i) { | 1177 | for (i = 0; i < serial->num_ports; ++i) { |