Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 478053055
Change-Id: I7de1c81a9c37495fd1facaa830bf93b14ef665ff
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
diff --git a/btpower.c b/btpower.c
index 7d7d125..158f4aa 100644
--- a/btpower.c
+++ b/btpower.c
@@ -583,6 +583,10 @@
LOGD(drvdata, "BT-OFF bt-hostwake-gpio(%d) IRQ(%d) value(%d)",
bt_host_wake_gpio, drvdata->irq,
gpio_get_value(bt_host_wake_gpio));
+ rc = disable_irq_wake(drvdata->irq);
+ if(rc) {
+ LOGE(drvdata, "Failed to disable IRQ wake");
+ }
free_irq(drvdata->irq, drvdata);
}
@@ -605,6 +609,10 @@
if (rc)
LOGE(drvdata, "unable to request IRQ %d (%d)",
bt_host_wake_gpio, rc);
+ rc = enable_irq_wake(drvdata->irq);
+ if(rc) {
+ LOGE(drvdata, "Failed to enable IRQ wake");
+ }
drvdata->hostwake_state = -1;
drvdata->hostwake_count = 0;
}
