From cb912f0e1adf6c5267208c1b226eb36f82171839 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Thu, 8 Jun 2023 06:48:09 -0400 Subject: [PATCH] LibEDID: Ignore duplicate PNP IDs The PNP IDs data file was recently updated with an accidental duplicate entry (HONOR Device Co., Ltd.). Rather than breaking everyone's build, let's just ignore duplicates. --- Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp b/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp index baff1c1710..b6bf779d76 100644 --- a/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp +++ b/Meta/Lagom/Tools/CodeGenerators/LibEDID/GeneratePnpIDs.cpp @@ -168,9 +168,7 @@ static ErrorOr> parse_pnp_ids_database(Core auto approval_date = TRY(parse_approval_date(columns[(size_t)PnpIdColumns::ApprovalDate])); auto decoded_manufacturer_name = TRY(decode_html_entities(columns[(size_t)PnpIdColumns::ManufacturerName])); - auto hash_set_result = pnp_id_data.set(columns[(size_t)PnpIdColumns::ManufacturerId], PnpIdData { .manufacturer_name = decoded_manufacturer_name, .approval_date = move(approval_date) }); - if (hash_set_result != AK::HashSetResult::InsertedNewEntry) - return Error::from_string_literal("Duplicate manufacturer ID encountered"); + pnp_id_data.set(columns[(size_t)PnpIdColumns::ManufacturerId], PnpIdData { .manufacturer_name = decoded_manufacturer_name, .approval_date = move(approval_date) }); row_content_offset = row_end.value() + row_end_tag.length(); }