Merge remote-tracking branches 'regulator/topic/of', 'regulator/topic/pv88080', ...

[mirror_ubuntu-hirsute-kernel.git] / drivers / media / cec-edid.c

diff --git a/drivers/media/cec-edid.c b/drivers/media/cec-edid.c
index 70018247bdda9ec9bc90a22e48713c27d47ff24b..5719b991e340d3df77cdbbedee48e36c67463273 100644 (file)
--- a/drivers/media/cec-edid.c
+++ b/drivers/media/cec-edid.c
@@ -70,7 +70,10 @@ static unsigned int cec_get_edid_spa_location(const u8 *edid, unsigned int size)
                                u8 tag = edid[i] >> 5;
                                u8 len = edid[i] & 0x1f;
 
-                               if (tag == 3 && len >= 5 && i + len <= end)
+                               if (tag == 3 && len >= 5 && i + len <= end &&
+                                   edid[i + 1] == 0x03 &&
+                                   edid[i + 2] == 0x0c &&
+                                   edid[i + 3] == 0x00)
                                        return i + 4;
                                i += len + 1;
                        } while (i < end);