| From d777e504da4f6aae7fd1d2e77165517046aea2ae Mon Sep 17 00:00:00 2001 |
| From: Johan Hovold <johan@kernel.org> |
| Date: Tue, 1 Oct 2019 10:49:07 +0200 |
| Subject: [PATCH] USB: serial: fix runtime PM after driver unbind |
| |
| commit d51bdb93ca7e71d7fb30a572c7b47ed0194bf3fe upstream. |
| |
| Since commit c2b71462d294 ("USB: core: Fix bug caused by duplicate |
| interface PM usage counter") USB drivers must always balance their |
| runtime PM gets and puts, including when the driver has already been |
| unbound from the interface. |
| |
| Leaving the interface with a positive PM usage counter would prevent a |
| later bound driver from suspending the device. |
| |
| Fixes: c2b71462d294 ("USB: core: Fix bug caused by duplicate interface PM usage counter") |
| Cc: stable <stable@vger.kernel.org> |
| Signed-off-by: Johan Hovold <johan@kernel.org> |
| Link: https://lore.kernel.org/r/20191001084908.2003-4-johan@kernel.org |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c |
| index 676c296103a2..270fb4e2ca1c 100644 |
| --- a/drivers/usb/serial/usb-serial.c |
| +++ b/drivers/usb/serial/usb-serial.c |
| @@ -314,10 +314,7 @@ static void serial_cleanup(struct tty_struct *tty) |
| serial = port->serial; |
| owner = serial->type->driver.owner; |
| |
| - mutex_lock(&serial->disc_mutex); |
| - if (!serial->disconnected) |
| - usb_autopm_put_interface(serial->interface); |
| - mutex_unlock(&serial->disc_mutex); |
| + usb_autopm_put_interface(serial->interface); |
| |
| usb_serial_put(serial); |
| module_put(owner); |
| -- |
| 2.7.4 |
| |
