[SRU][Resolute][PATCH 1/1] UBUNTU: SAUCE: ACPI: respect items already in honor_dep before skipping

[You-Sheng Yang]

BugLink: https://bugs.launchpad.net/bugs/2145171

Upstream v6.18-rc1 commit 4405a214df146775338a1e6232701a29024b82e1
"ACPI: scan: Add Intel CVS ACPI HIDs to acpi_ignore_dep_ids[]" (also
backported to v6.17.8, v6.12.58), which in effect reverts a not yet
upstreamed Intel MIPI camera patch titled "ACPI: scan: Update HID for
new platform" meant for bug 2090932, and therefore they share the same
symptom:

  [ 4.484426] ov02c10 i2c-OVTI02C1:00: chip id mismatch: 560243!=0
  [ 4.484432] ov02c10 i2c-OVTI02C1:00: failed to find sensor: -6

This patch respects upstream change while keeping Ubuntu's enablement
efforts remaining effective.

Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 drivers/acpi/scan.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 12ba9627c3b54..15f885beaa979 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2027,7 +2027,7 @@ int acpi_scan_add_dep(acpi_handle handle, struct acpi_handle_list *dep_devices)
 		honor_dep = acpi_info_matches_ids(info, acpi_honor_dep_ids);
 		kfree(info);
 
-		if (skip)
+		if (skip && !honor_dep)
 			continue;
 
 		dep = kzalloc_obj(*dep);
-- 
2.51.0