diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2022-11-27 19:35:02 -0800 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2022-11-27 19:35:02 -0800 |
| commit | 9cc533bf4e533f90504fe355b5fcc726c1c549e0 (patch) | |
| tree | 9ed3cf12060311f3dd3001a847fc9781e69e9cc6 | |
| parent | eb9bb239f370c1c5ea74e2a747f52f2c4ca9c3d7 (diff) | |
| parent | 7bd63dff111562973ce71e50a3b9039683217aa0 (diff) | |
| download | gs201-9cc533bf4e533f90504fe355b5fcc726c1c549e0.tar.gz | |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udcandroid-u-preview-1_r0.4android-u-preview-1_r0.3android-u-preview-1_r0.2android-gs-raviole-5.10-u-preview-1android-gs-pantah-5.10-u-preview-1android-gs-bluejay-5.10-u-preview-1
SBMerger: 478053055
Change-Id: I6c282abde0ce3ee14155bae57bfafa697f07ba60
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | gxp-mailbox.c | 4 | ||||
| -rw-r--r-- | gxp-platform.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/gxp-mailbox.c b/gxp-mailbox.c index f925125..aa28fc0 100644 --- a/gxp-mailbox.c +++ b/gxp-mailbox.c @@ -20,8 +20,8 @@ #include "gxp-mailbox-driver.h" #include "gxp-pm.h" -/* Timeout of 8s by default to account for slower emulation platforms */ -int gxp_mbx_timeout = 8000; +/* Timeout of 1s by default */ +int gxp_mbx_timeout = 1000; module_param_named(mbx_timeout, gxp_mbx_timeout, int, 0660); /* Utilities of circular queue operations */ diff --git a/gxp-platform.c b/gxp-platform.c index 642d829..5da0eb2 100644 --- a/gxp-platform.c +++ b/gxp-platform.c @@ -51,6 +51,8 @@ #include "gxp-wakelock.h" #include "gxp.h" +static struct gxp_dev *gxp_debug_pointer; + #define __wait_event_lock_irq_timeout_exclusive(wq_head, condition, lock, \ timeout, state) \ ___wait_event(wq_head, ___wait_cond_timeout(condition), state, 1, \ @@ -2237,6 +2239,8 @@ static int gxp_platform_probe(struct platform_device *pdev) INIT_LIST_HEAD(&gxp->client_list); mutex_init(&gxp->client_list_lock); + gxp_debug_pointer = gxp; + return 0; err_vd_destroy: gxp_vd_destroy(gxp); @@ -2278,6 +2282,8 @@ static int gxp_platform_remove(struct platform_device *pdev) devm_kfree(dev, (void *)gxp); + gxp_debug_pointer = NULL; + return 0; } |