diff options
author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-03-12 18:40:13 -0700 |
---|---|---|
committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-03-12 18:40:13 -0700 |
commit | f6f8d947b220e094ea67d3ecda81762a86403851 (patch) | |
tree | d9984f2269680208cad36b1a405c6bd889458d73 | |
parent | 046d4fee0e81db1fa3b190e30f55483f8dcf9c16 (diff) | |
parent | 167caf2b1f4a2fea792064e6334cee22581e79ad (diff) | |
download | common-f6f8d947b220e094ea67d3ecda81762a86403851.tar.gz |
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udcandroid-u-beta-1_r0.5android-u-beta-1_r0.4android-u-beta-1_r0.3android-gs-raviole-5.10-u-beta1android-gs-pantah-5.10-u-beta1android-gs-bluejay-5.10-u-beta1
SBMerger: 478053055
Change-Id: Ic9e3906ef3f7edd186f8ecd50ab0a9381482bac9
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r-- | goog_touch_interface.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/goog_touch_interface.c b/goog_touch_interface.c index 85c4dd5..a996756 100644 --- a/goog_touch_interface.c +++ b/goog_touch_interface.c @@ -3499,10 +3499,13 @@ struct goog_touch_interface *goog_touch_interface_probe( } if (gti && gti->dev) { - goog_init_input(gti); goog_init_proc(gti); goog_init_options(gti, options); goog_offload_probe(gti); + /* + * goog_init_input() needs the offload.cap initialization by goog_offload_probe(). + */ + goog_init_input(gti); goog_update_fw_settings(gti); goog_register_tbn(gti); goog_pm_probe(gti); |