diff options
| author | PixelBot AutoMerger <android-nexus-securitybot@system.gserviceaccount.com> | 2023-07-09 18:25:32 -0700 |
|---|---|---|
| committer | SecurityBot <android-nexus-securitybot@system.gserviceaccount.com> | 2023-07-09 18:25:32 -0700 |
| commit | 997a693de9062e9302aa50bf7430dc5de157f9d7 (patch) | |
| tree | 20982f27ee1f4d2cbcb52b56d8e152f628cc955d | |
| parent | c87114bfb3d500520036aabccc3568367e239a5e (diff) | |
| parent | 222ba497c1337c6f25ec0d4bcb4cff2782a52665 (diff) | |
| download | aoc-997a693de9062e9302aa50bf7430dc5de157f9d7.tar.gz | |
Merge android13-gs-pixel-5.10-udc into android13-gs-pixel-5.10-udc-qpr1
SBMerger: 526756187
Change-Id: I8a2bc57fe0e57bc5cd708d222924404bc269d497
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
| -rw-r--r-- | aoc_channel_dev.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/aoc_channel_dev.c b/aoc_channel_dev.c index 2532f79..7da42a1 100644 --- a/aoc_channel_dev.c +++ b/aoc_channel_dev.c @@ -855,7 +855,7 @@ static int aocc_prepare(struct device *dev) struct aoc_service_dev *service = container_of(parent, struct aoc_service_dev, dev); int rc; - if (strcmp(dev_name(dev), "com.google.usf") != 0) + if (strcmp(dev_name(&service->dev), "com.google.usf") != 0) return 0; rc = aocc_send_cmd_msg(service, AOCC_CMD_SUSPEND_PREPARE, 0); @@ -871,7 +871,7 @@ static void aocc_complete(struct device *dev) struct aoc_service_dev *service = container_of(parent, struct aoc_service_dev, dev); int rc; - if (strcmp(dev_name(dev), "com.google.usf") != 0) + if (strcmp(dev_name(&service->dev), "com.google.usf") != 0) return; rc = aocc_send_cmd_msg(service, AOCC_CMD_WAKEUP_COMPELTE, 0); |