projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
drm_edid_load.c
diff --git
a/drivers/gpu/drm/drm_edid_load.c
b/drivers/gpu/drm/drm_edid_load.c
index
66d4a28
..
0303935
100644
(file)
--- a/
drivers/gpu/drm/drm_edid_load.c
+++ b/
drivers/gpu/drm/drm_edid_load.c
@@
-119,7
+119,7
@@
static int edid_load(struct drm_connector *connector, char *name,
{
const struct firmware *fw;
struct platform_device *pdev;
{
const struct firmware *fw;
struct platform_device *pdev;
- u8 *fwdata = NULL, *edid;
+ u8 *fwdata = NULL, *edid
, *new_edid
;
int fwsize, expected;
int builtin = 0, err = 0;
int i, valid_extensions = 0;
int fwsize, expected;
int builtin = 0, err = 0;
int i, valid_extensions = 0;
@@
-195,12
+195,14
@@
static int edid_load(struct drm_connector *connector, char *name,
"\"%s\" for connector \"%s\"\n", valid_extensions,
edid[0x7e], name, connector_name);
edid[0x7e] = valid_extensions;
"\"%s\" for connector \"%s\"\n", valid_extensions,
edid[0x7e], name, connector_name);
edid[0x7e] = valid_extensions;
- edid = krealloc(edid, (valid_extensions + 1) * EDID_LENGTH,
+
new_
edid = krealloc(edid, (valid_extensions + 1) * EDID_LENGTH,
GFP_KERNEL);
GFP_KERNEL);
- if (edid == NULL) {
+ if (
new_
edid == NULL) {
err = -ENOMEM;
err = -ENOMEM;
+ kfree(edid);
goto relfw_out;
}
goto relfw_out;
}
+ edid = new_edid;
}
connector->display_info.raw_edid = edid;
}
connector->display_info.raw_edid = edid;