diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2021-01-19 05:41:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2021-01-19 05:41:44 +0100 |
| commit | b5d3c4c00dff9211fb271e644ae5e98aa0a0853e (patch) | |
| tree | 8f9d871b2a51b27ad345bece85ce59ee4e8d6c52 /drivers/video/edid.c | |
| parent | 2ea982543a2570af2f7629e08bb6d3ff28b07e3a (diff) | |
| parent | aa3cdd7c55bfcbbc2da56220a809b5ac39ac3346 (diff) | |
| download | barebox-b5d3c4c00dff9211fb271e644ae5e98aa0a0853e.tar.gz barebox-b5d3c4c00dff9211fb271e644ae5e98aa0a0853e.tar.xz | |
Merge branch 'for-next/video'
Diffstat (limited to 'drivers/video/edid.c')
| -rw-r--r-- | drivers/video/edid.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/edid.c b/drivers/video/edid.c index bee4594118..1baff7317b 100644 --- a/drivers/video/edid.c +++ b/drivers/video/edid.c @@ -223,19 +223,19 @@ static int edid_checksum(unsigned char *edid) return err; } -static int edid_check_header(unsigned char *edid) +bool edid_check_header(unsigned char *edid) { - int i, err = 1, fix = check_edid(edid); + int i, fix = check_edid(edid); if (fix) fix_edid(edid, fix); for (i = 0; i < 8; i++) { if (edid[i] != edid_v1_header[i]) - err = 0; + return false; } - return err; + return true; } /* @@ -858,6 +858,9 @@ void *edid_read_i2c(struct i2c_adapter *adapter) { u8 *block; + if (!IS_ENABLED(CONFIG_I2C)) + return NULL; + block = xmalloc(EDID_LENGTH); if (edid_do_read_i2c(adapter, block, 0, EDID_LENGTH)) |