Merge android13-gs-pixel-5.10-24Q2 into android13-gs-pixel-5.10

SBMerger: 571992243
Change-Id: I00fea1913897ad67de554f1371c1d45d36e87874
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

1 files changed, 7 insertions, 0 deletions

diff --git a/dhd_pcie.c b/dhd_pcie.c
index 7be2891..2300e6d 100644
--- a/dhd_pcie.c
+++ b/dhd_pcie.c
@@ -2212,6 +2212,13 @@ dhdpcie_dongle_attach(dhd_bus_t *bus)
 		if (PCIECTO_ENAB(bus)) {
 			dhdpcie_cto_init(bus, TRUE);
 		}
+		cc = (chipcregs_t*)si_setcore(bus->sih, CC_CORE_ID, 0);
+		if (cc) {
+			AND_REG(osh, &cc->clk_ctl_st, ~CCS_FORCEHT);
+		} else {
+			DHD_ERROR(("CC is NULL\n"));
+		}
+		si_setcore(bus->sih, origidx, 0);
 	}
 
 	/* need to set the force_bt_quiesce flag here