diff options
| author | Paul Burton <paulburton@kernel.org> | 2019-11-01 14:35:49 -0700 |
|---|---|---|
| committer | Paul Burton <paulburton@kernel.org> | 2019-11-01 14:36:44 -0700 |
| commit | 02fce139fd14d3b0126f0a72e8c0a83b5b01f9f5 (patch) | |
| tree | 20e69aae8d0acfcd7edc954e70a9d751e0b54a7e /drivers/usb/class/usblp.c | |
| parent | 8a5a499871308c093ced3c5a383b72502b96e0d2 (diff) | |
| parent | b42aa3fd5957e4daf4b69129e5ce752a2a53e7d6 (diff) | |
Merge tag 'mips_fixes_5.4_3' into mips-next
Pull in mips-fixes primarily to gain build fixes in order to allow
better testing of mips-next.
A few MIPS fixes:
- Fix VDSO time-related function behavior for systems where we need to
fall back to syscalls, but were instead returning bogus results.
- A fix to TLB exception handlers for Cavium Octeon systems where they
would inadvertently clobber the $1/$at register.
- A build fix for bcm63xx configurations.
- Switch to using my @kernel.org email address.
Signed-off-by: Paul Burton <paulburton@kernel.org>
Diffstat (limited to 'drivers/usb/class/usblp.c')
| -rw-r--r-- | drivers/usb/class/usblp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/usb/class/usblp.c b/drivers/usb/class/usblp.c index 7fea4999d352..fb8bd60c83f4 100644 --- a/drivers/usb/class/usblp.c +++ b/drivers/usb/class/usblp.c @@ -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; |