mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
USB: usblp: fix runtime PM after driver unbind
Since commitc2b71462d2
("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:c2b71462d2
("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-3-johan@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5c290a5e42
commit
9a31535859
1 changed files with 5 additions and 3 deletions
|
@ -461,10 +461,12 @@ static int usblp_release(struct inode *inode, struct file *file)
|
|||
|
||||
mutex_lock(&usblp_mutex);
|
||||
usblp->used = 0;
|
||||
if (usblp->present) {
|
||||
if (usblp->present)
|
||||
usblp_unlink_urbs(usblp);
|
||||
usb_autopm_put_interface(usblp->intf);
|
||||
} else /* finish cleanup from disconnect */
|
||||
|
||||
usb_autopm_put_interface(usblp->intf);
|
||||
|
||||
if (!usblp->present) /* finish cleanup from disconnect */
|
||||
usblp_cleanup(usblp);
|
||||
mutex_unlock(&usblp_mutex);
|
||||
return 0;
|
||||
|
|
Loading…
Reference in a new issue