---

yaml --- r: 209337 b: refs/heads/master c: 54b9b30 h: refs/heads/master i: 209335: 0f61013 v: v3
git-mirror · Aug 13, 2010 · ebd64b2 · ebd64b2
1 parent 88f1c31
commit ebd64b2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2016e4a0a1c49b68c9d820e28dadab7080c45d1b
+refs/heads/master: 54b9b308fa39e5147e2edde3492d8650b957be6c
diff --git a/trunk/drivers/gpu/drm/i915/i915_opregion.c b/trunk/drivers/gpu/drm/i915/i915_opregion.c
@@ -535,6 +535,7 @@ int intel_opregion_init(struct drm_device *dev, int resume)
 err_out:
 	iounmap(opregion->header);
 	opregion->header = NULL;
+	acpi_video_register();
 	return err;
 }