|
@@ -590,12 +590,13 @@ static void acm_port_shutdown(struct tty_port *port)
|
|
struct urb *urb;
|
|
struct urb *urb;
|
|
struct acm_wb *wb;
|
|
struct acm_wb *wb;
|
|
int i;
|
|
int i;
|
|
|
|
+ int pm_err;
|
|
|
|
|
|
dev_dbg(&acm->control->dev, "%s\n", __func__);
|
|
dev_dbg(&acm->control->dev, "%s\n", __func__);
|
|
|
|
|
|
mutex_lock(&acm->mutex);
|
|
mutex_lock(&acm->mutex);
|
|
if (!acm->disconnected) {
|
|
if (!acm->disconnected) {
|
|
- usb_autopm_get_interface(acm->control);
|
|
|
|
|
|
+ pm_err = usb_autopm_get_interface(acm->control);
|
|
acm_set_control(acm, acm->ctrlout = 0);
|
|
acm_set_control(acm, acm->ctrlout = 0);
|
|
|
|
|
|
for (;;) {
|
|
for (;;) {
|
|
@@ -613,7 +614,8 @@ static void acm_port_shutdown(struct tty_port *port)
|
|
for (i = 0; i < acm->rx_buflimit; i++)
|
|
for (i = 0; i < acm->rx_buflimit; i++)
|
|
usb_kill_urb(acm->read_urbs[i]);
|
|
usb_kill_urb(acm->read_urbs[i]);
|
|
acm->control->needs_remote_wakeup = 0;
|
|
acm->control->needs_remote_wakeup = 0;
|
|
- usb_autopm_put_interface(acm->control);
|
|
|
|
|
|
+ if (!pm_err)
|
|
|
|
+ usb_autopm_put_interface(acm->control);
|
|
}
|
|
}
|
|
mutex_unlock(&acm->mutex);
|
|
mutex_unlock(&acm->mutex);
|
|
}
|
|
}
|