git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_acpi.c
diff --git
a/drivers/gpu/drm/nouveau/nouveau_acpi.c
b/drivers/gpu/drm/nouveau/nouveau_acpi.c
index
c17a055
..
1191526
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_acpi.c
+++ b/
drivers/gpu/drm/nouveau/nouveau_acpi.c
@@
-292,6
+292,6
@@
nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
if (ret < 0)
return ret;
- nv_connector->edid =
edid
;
+ nv_connector->edid =
kmemdup(edid, EDID_LENGTH, GFP_KERNEL)
;
return 0;
}