summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com>2023-04-09 18:25:47 -0700
committerSecurityBot <android-nexus-securitybot@system.gserviceaccount.com>2023-04-09 18:25:47 -0700
commite3702e7d790236d5209ea68c3b7b69cb968e95ed (patch)
tree08a35d7c15bf187bc69092460b5644b95829117f
parent30c112a4dc80545c1283fed02d9e0a4dd1bee3d4 (diff)
parent676c16df8585f0b8178dc5c22fee18033ea03ec8 (diff)
downloadlwis-e3702e7d790236d5209ea68c3b7b69cb968e95ed.tar.gz
Merge android13-gs-pixel-5.10-tm-qpr3 into android13-gs-pixel-5.10-udc
SBMerger: 516612970 Change-Id: I0ef605e6c77fd69fe6f72565bacb622b58cf81a6 Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
-rw-r--r--lwis_device_top.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lwis_device_top.c b/lwis_device_top.c
index 449936b..ea4085e 100644
--- a/lwis_device_top.c
+++ b/lwis_device_top.c
@@ -218,13 +218,14 @@ static int lwis_top_event_subscribe(struct lwis_device *lwis_dev, int64_t trigge
return -EINVAL;
}
+ spin_lock_irqsave(&lwis_top_dev->base_dev.lock, flags);
event_subscriber_list = event_subscriber_list_find_or_create(lwis_dev, trigger_event_id);
if (!event_subscriber_list) {
+ spin_unlock_irqrestore(&lwis_top_dev->base_dev.lock, flags);
dev_err(lwis_dev->dev, "Can't find/create event subscriber list\n");
return -EINVAL;
}
- spin_lock_irqsave(&lwis_top_dev->base_dev.lock, flags);
list_for_each (it_event_subscriber, &event_subscriber_list->list) {
old_subscription = list_entry(it_event_subscriber, struct lwis_event_subscribe_info,
list_node);