summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSuper Liu <supercjliu@google.com>2023-04-17 03:09:02 +0000
committerSuper Liu <supercjliu@google.com>2023-04-17 03:21:04 +0000
commit683dc9b16e77314b96c63148313c94802aa34425 (patch)
tree2ef5096ebbc86858c1a1376f6fcb7f1f589cf1cc
parent61b753652dc52bcc225388343338e9e9e5f82868 (diff)
downloadcommon-683dc9b16e77314b96c63148313c94802aa34425.tar.gz
touch/gti: Support multiple offload ids if available
Bug: 272408020 Change-Id: I2eb46b3745938557d5b73bfc0959871d77df314a Signed-off-by: Super Liu <supercjliu@google.com>
-rw-r--r--goog_touch_interface.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/goog_touch_interface.c b/goog_touch_interface.c
index 1da3d23..1583293 100644
--- a/goog_touch_interface.c
+++ b/goog_touch_interface.c
@@ -2413,7 +2413,7 @@ int gti_charger_state_change(struct notifier_block *nb, unsigned long action,
int goog_offload_probe(struct goog_touch_interface *gti)
{
int ret;
- int err;
+ int err = 0;
u16 values[2];
struct device_node *np = gti->vendor_dev->of_node;
const char *offload_dev_name = NULL;
@@ -2430,8 +2430,8 @@ int goog_offload_probe(struct goog_touch_interface *gti)
"%s_%s", DEVICE_NAME, offload_dev_name);
}
- if (gti->panel_id >= 0) {
- offload_ids_size = of_property_count_u8_elems(np, "goog,touch_offload_ids");
+ offload_ids_size = of_property_count_u8_elems(np, "goog,touch_offload_ids");
+ if (offload_ids_size > 0 && gti->panel_id >= 0) {
id_size = sizeof(gti->offload_id);
offload_ids_array = devm_kzalloc(gti->vendor_dev, offload_ids_size, GFP_KERNEL);