This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: edid-decode: fix incorrect warning for DisplayID v1 Author: Hans Verkuil <hverk...@xs4all.nl> Date: Fri Feb 21 00:46:57 2025 +0100 The Product Identification Data Block has a PNP ascii string, but edid-decode incorrectly gave a warning about it being an unknown OUI. Signed-off-by: Hans Verkuil <hverk...@xs4all.nl> utils/edid-decode/edid-decode.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=179f35f6d510ace6e24992837e48472905927a76 diff --git a/utils/edid-decode/edid-decode.cpp b/utils/edid-decode/edid-decode.cpp index b75b4a521f6b..8d611b8f97a7 100644 --- a/utils/edid-decode/edid-decode.cpp +++ b/utils/edid-decode/edid-decode.cpp @@ -857,19 +857,17 @@ void edid_state::data_block_oui(std::string block_name, const unsigned char *x, if (oui || !ignorezeros) { if (!silent) printf(" %s:\n", data_block.c_str()); - if (length < 3) + if (length < 3) { fail("Data block length (%d) is not enough to contain an OUI.\n", length); - else if (ouiname) { + } else if (ouiname) { if (do_ascii && !valid_ascii) warn("Expected PNP ID but found OUI.\n"); if (matched_reverse) fail("Endian-ness (%s) of OUI is different than expected (%s).\n", big_endian ? "be" : "le", big_endian ? "le" : "be"); - } - else { - if (valid_ascii) - warn("Unknown OUI %s (possible PNP %s).\n", buf.c_str(), ascii); - else - warn("Unknown OUI %s.\n", buf.c_str()); + } else if (!do_ascii && valid_ascii) { + warn("Unknown OUI %s (possible PNP %s).\n", buf.c_str(), ascii); + } else if (!do_ascii) { + warn("Unknown OUI %s.\n", buf.c_str()); } } }
