From 824645385979cf00626c048fcc5443e7209af458 Mon Sep 17 00:00:00 2001 From: Pierre-Clément Tosi Date: Fri, 6 Oct 2023 13:35:44 +0100 Subject: ANDROID: De-dup fdt_path_offset_namelen check Due to a missing "Merged-In" tag, automerger got confused and AOSP ended up with "libfdt: fdt_path_offset_namelen: Reject empty paths" being applied twice: commit d10c84c4bc78e8ebd8c6ebf70126ad3cb0ba1c46 commit a6ac6d916df145366bcb34f5507d5da213b2ebaf so remove the duplicated code. Test: N/A Change-Id: I3684b3d6af1be02a96ffa04f98c15297f890cc74 --- libfdt/fdt_ro.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'libfdt/fdt_ro.c') diff --git a/libfdt/fdt_ro.c b/libfdt/fdt_ro.c index a62ec78..362cc4a 100644 --- a/libfdt/fdt_ro.c +++ b/libfdt/fdt_ro.c @@ -263,9 +263,6 @@ int fdt_path_offset_namelen(const void *fdt, const char *path, int namelen) FDT_RO_PROBE(fdt); - if (namelen < 1) - return -FDT_ERR_BADPATH; - if (namelen < 1) return -FDT_ERR_BADPATH; -- cgit v1.2.3-59-g8ed1b