projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-fixes into drm-misc-fixes
[linux-2.6-microblaze.git]
/
drivers
/
gpu
/
drm
/
drm_edid.c
diff --git
a/drivers/gpu/drm/drm_edid.c
b/drivers/gpu/drm/drm_edid.c
index
3d0a4da
..
261a62e
100644
(file)
--- a/
drivers/gpu/drm/drm_edid.c
+++ b/
drivers/gpu/drm/drm_edid.c
@@
-2796,7
+2796,7
@@
u32 drm_edid_get_panel_id(struct i2c_adapter *adapter)
* the EDID then we'll just return 0.
*/
- base_block = k
m
alloc(EDID_LENGTH, GFP_KERNEL);
+ base_block = k
z
alloc(EDID_LENGTH, GFP_KERNEL);
if (!base_block)
return 0;