aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVincent Stehlé <v-stehle@ti.com>2011-08-19 05:58:09 -0400
committerPaolo Pisati <paolo.pisati@canonical.com>2012-08-17 04:19:30 -0400
commit8085a37d1c0a372b70c3602ef7c49e91e1040eff (patch)
tree8d5424576c51a3ed2b806766b82a464b1ffc5f5c
parentd1058a96b1604c8669d7659b4eabf7061e25088f (diff)
DRM: Revert one DRM change to make SGX work.
Signed-off-by: Vincent Stehlé <v-stehle@ti.com> Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com> Signed-off-by: Tim Gardner <tim.gardner@canonical.com> Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
-rw-r--r--drivers/gpu/drm/drm_stub.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_stub.c b/drivers/gpu/drm/drm_stub.c
index eff62843207..6d7b083c5b7 100644
--- a/drivers/gpu/drm/drm_stub.c
+++ b/drivers/gpu/drm/drm_stub.c
@@ -356,7 +356,7 @@ int drm_get_minor(struct drm_device *dev, struct drm_minor **minor, int type)
356 new_minor->index = minor_id; 356 new_minor->index = minor_id;
357 INIT_LIST_HEAD(&new_minor->master_list); 357 INIT_LIST_HEAD(&new_minor->master_list);
358 358
359 idr_replace(&drm_minors_idr, ERR_PTR(-EAGAIN), minor_id); 359 idr_replace(&drm_minors_idr, new_minor, minor_id);
360 360
361 if (type == DRM_MINOR_LEGACY) { 361 if (type == DRM_MINOR_LEGACY) {
362 ret = drm_proc_init(new_minor, minor_id, drm_proc_root); 362 ret = drm_proc_init(new_minor, minor_id, drm_proc_root);