Merge android14-gs-pixel-5.15-24Q1 into android14-gs-pixel-5.15

SBMerger: 571992243
Change-Id: Ic5731e32f78d47d1b3f9b096c100c887f139171d
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>

1 files changed, 1 insertions, 0 deletions

diff --git a/aoc.c b/aoc.c
index b13487f..f84a182 100644
--- a/aoc.c
+++ b/aoc.c
@@ -2550,6 +2550,7 @@ err_memnode:
 err_chardev:
 err_failed_prvdata_alloc:
 err_invalid_dt:
+	aoc_platform_device = NULL;
 err_platform_not_null:
 	return rc;
 }