From 16060d028a995f766e2fac6b95e66f1b5029510d Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Fri, 10 Sep 2010 15:33:11 +1000 Subject: [PATCH] --- yaml --- r: 218195 b: refs/heads/master c: 24b102d3488c9d201915d070a519e07098e0cd30 h: refs/heads/master i: 218193: ef5dfc644c11ba648c56e6ef1c3f6259e0dfb467 218191: 1a041aa22d8d3178836f2eefadadea69ae8d66ad v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 088f3f46759d..94811d08d7f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e071f8cd714261cb4f5ce7104eb54b16b2bbb0cf +refs/heads/master: 24b102d3488c9d201915d070a519e07098e0cd30 diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c b/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c index c17a055ee3e5..119152606e4c 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_acpi.c +++ b/trunk/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; }