浏览代码

USB: cdc-acm: fix runtime PM imbalance at shutdown

Make sure only to decrement the PM counters if they were actually
incremented.

Note that the USB PM counter, but not necessarily the driver core PM
counter, is reset when the interface is unbound.

Fixes: 11ea859d64b6 ("USB: additional power savings for cdc-acm devices
that support remote wakeup")

Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Johan Hovold 11 年之前
父节点
当前提交
5292afa657
共有 1 个文件被更改,包括 4 次插入2 次删除
  1. 4 2
      drivers/usb/class/cdc-acm.c

+ 4 - 2
drivers/usb/class/cdc-acm.c

@@ -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);
 }
 }