commit 025fbd45ea3335aaddff680e47de1091ff548b3b
author Edmond Chung <edmondchung@google.com> Fri Feb 04 16:05:47 2022 -0800
committer Edmond Chung <edmondchung@google.com> Thu Feb 10 03:26:11 2022 +0000
tree 0550dbbcd25d1cbd23dac0fef6c682dd544b6e9f
parent e519fa315845e931638f5bd86351ec48fae0cc37

Event: Need to clear error event queue in between sessions

Bug: 217974742
Test: GCA and CTS
Signed-off-by: Edmond Chung <edmondchung@google.com>
Change-Id: I181e2b81b8b80873b36511fb4282ff261162ef8e

lwis_device.c

diff --git a/lwis_device.c b/lwis_device.c
index e473b9b..2d113ba 100644
--- a/lwis_device.c
+++ b/lwis_device.c
@@ -148,8 +148,9 @@
 	/* Clear event states for this client */
 	lwis_client_event_states_clear(lwis_client);
 
-	/* Clear the event queue */
+	/* Clear the event queues */
 	lwis_client_event_queue_clear(lwis_client);
+	lwis_client_error_event_queue_clear(lwis_client);
 
 	/* Clean up all periodic io state for the client */
 	lwis_periodic_io_client_cleanup(lwis_client);

lwis_ioctl.c

diff --git a/lwis_ioctl.c b/lwis_ioctl.c
index 3ed9b5c..13e319c 100644
--- a/lwis_ioctl.c
+++ b/lwis_ioctl.c
@@ -566,9 +566,10 @@
 		goto error_locked;
 	}
 
-	/* Clear event queue to make sure there is no stale event from
+	/* Clear event queues to make sure there is no stale event from
 	 * previous session */
 	lwis_client_event_queue_clear(lwis_client);
+	lwis_client_error_event_queue_clear(lwis_client);
 
 	ret = lwis_dev_power_up_locked(lwis_dev);
 	if (ret < 0) {
@@ -688,10 +689,11 @@
 		goto soft_reset_exit;
 	}
 
-	/* Clear event states, event queue and transactions for this client */
+	/* Clear event states, event queues and transactions for this client */
 	mutex_lock(&lwis_dev->client_lock);
 	lwis_client_event_states_clear(lwis_client);
 	lwis_client_event_queue_clear(lwis_client);
+	lwis_client_error_event_queue_clear(lwis_client);
 	device_enabled = lwis_dev->enabled;
 	mutex_unlock(&lwis_dev->client_lock);