浏览代码

qcacmn: Release RTPM refcount if force wake release fails

Currently RTPM refcount is not released if force
wake release fails. This leads to mismatch in number of
RTPM get and put during RTPM de-init.
Fix this refcount release if force wake release fails.

Change-Id: I4334de57e00139c0d30d37d7e19a399760400a50
CRs-Fixed: 3544981
Amit Mehta 2 年之前
父节点
当前提交
241f75e574
共有 1 个文件被更改,包括 13 次插入11 次删除
  1. 13 11
      hif/src/pcie/if_pci.c

+ 13 - 11
hif/src/pcie/if_pci.c

@@ -4150,9 +4150,11 @@ release_mhi_wake:
 	if (ret) {
 		hif_err("pld force wake release failure");
 		HIF_STATS_INC(pci_scn, mhi_force_wake_release_failure, 1);
-		return ret;
+		status = ret;
+	} else {
+		HIF_STATS_INC(pci_scn, mhi_force_wake_release_success, 1);
 	}
-	HIF_STATS_INC(pci_scn, mhi_force_wake_release_success, 1);
+
 release_rtpm_ref:
 	/* Release runtime PM force wake */
 	ret = hif_rtpm_put(HIF_RTPM_PUT_ASYNC, HIF_RTPM_ID_FORCE_WAKE);
@@ -4166,7 +4168,7 @@ release_rtpm_ref:
 
 int hif_force_wake_release(struct hif_opaque_softc *hif_handle)
 {
-	int ret;
+	int ret, status;
 	struct hif_softc *scn = (struct hif_softc *)hif_handle;
 	struct hif_pci_softc *pci_scn = HIF_GET_PCI_SOFTC(scn);
 
@@ -4177,19 +4179,19 @@ int hif_force_wake_release(struct hif_opaque_softc *hif_handle)
 	if (ret) {
 		hif_err("pld force wake release failure");
 		HIF_STATS_INC(pci_scn, mhi_force_wake_release_failure, 1);
-		return ret;
+		goto release_rtpm_ref;
 	}
 	HIF_STATS_INC(pci_scn, mhi_force_wake_release_success, 1);
+	HIF_STATS_INC(pci_scn, soc_force_wake_release_success, 1);
 
+release_rtpm_ref:
 	/* Release runtime PM force wake */
-	ret = hif_rtpm_put(HIF_RTPM_PUT_ASYNC, HIF_RTPM_ID_FORCE_WAKE);
-	if (ret) {
-		hif_err("runtime pm put failure");
-		return ret;
+	status = hif_rtpm_put(HIF_RTPM_PUT_ASYNC, HIF_RTPM_ID_FORCE_WAKE);
+	if (status) {
+		hif_err("runtime pm put failure: %d", status);
+		return status;
 	}
-
-	HIF_STATS_INC(pci_scn, soc_force_wake_release_success, 1);
-	return 0;
+	return ret;
 }
 
 #else /* DEVICE_FORCE_WAKE_ENABLE */