USB: ks_bridge: Fix PM usage counter mismatch
The runtime PM is disabled for a device during suspend. It is
enabled again just before resuming the device. The resume method
of USB interface drivers are called while resuming a USB device. As
USB device is the parent of an interface, the interface resume is
blocked till USB device resume is completed. If interface driver
call any runtime PM API before interface runtime PM is enabled, it
fails with -EACCESS error.
The USB runtime wrapper usb_autopm_get_interface() decrements PM usage
counter when get_sync() is failed. The current code is decrementing
the PM usage counter even when an error code is returned from
usb_autopm_get_interface(). Due to this double decrementing, the KS
bridge interface PM usage counter is becoming negative after several
suspend and resume cycles. Once the PM usage counter becomes negative,
the interface runtime PM state will never become active. That means,
USB device suspend can happen even when a Tx URB is pending from ks
bridge driver.
The fix is trivial. Don't decrement PM usage counter when error code
is returned from usb_autopm_get_interface().
(cherry picked from commit 361d9af92470ebeeb0a42f73e6eb457ab279b282)
Conflicts:
drivers/usb/misc/ks_bridge.c
CRs-Fixed: 437214
Change-Id: I96c9e1797c137cd158c424ebf6342f607cee6d78
Signed-off-by: Pavankumar Kondeti <pkondeti@codeaurora.org>
diff --git a/drivers/usb/misc/ks_bridge.c b/drivers/usb/misc/ks_bridge.c
index ce50a99..cb47b72 100644
--- a/drivers/usb/misc/ks_bridge.c
+++ b/drivers/usb/misc/ks_bridge.c
@@ -482,27 +482,28 @@
struct urb *urb;
int i = 0;
int ret;
+ bool put = true;
+ ret = usb_autopm_get_interface(ksb->ifc);
+ if (ret < 0) {
+ if (ret != -EAGAIN && ret != -EACCES) {
+ pr_err_ratelimited("autopm_get failed:%d", ret);
+ return;
+ }
+ put = false;
+ }
for (i = 0; i < NO_RX_REQS; i++) {
pkt = ksb_alloc_data_pkt(MAX_DATA_PKT_SIZE, GFP_KERNEL, ksb);
if (IS_ERR(pkt)) {
pr_err("unable to allocate data pkt");
- return;
+ break;
}
urb = usb_alloc_urb(0, GFP_KERNEL);
if (!urb) {
pr_err("unable to allocate urb");
ksb_free_data_pkt(pkt);
- return;
- }
-
- ret = usb_autopm_get_interface(ksb->ifc);
- if (ret < 0 && ret != -EAGAIN && ret != -EACCES) {
- pr_err_ratelimited("autopm_get failed:%d", ret);
- usb_free_urb(urb);
- ksb_free_data_pkt(pkt);
- return;
+ break;
}
usb_fill_bulk_urb(urb, ksb->udev, ksb->in_pipe,
@@ -518,13 +519,13 @@
usb_unanchor_urb(urb);
usb_free_urb(urb);
ksb_free_data_pkt(pkt);
- usb_autopm_put_interface(ksb->ifc);
- return;
+ break;
}
- usb_autopm_put_interface_async(ksb->ifc);
usb_free_urb(urb);
}
+ if (put)
+ usb_autopm_put_interface_async(ksb->ifc);
}
static int