Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt...

[net-next-2.6.git] / drivers / gpu / drm / i915 / i915_opregion.c

diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c
index ce402b2568be733a5c5a3c102a81fd2ab4eefe2b..ea5d3fea4b61a2cd56dc4d2da4bad6fe3d94ea43 100644 (file)
--- a/drivers/gpu/drm/i915/i915_opregion.c
+++ b/drivers/gpu/drm/i915/i915_opregion.c
@@ -531,6 +531,7 @@ int intel_opregion_init(struct drm_device *dev, int resume)
 err_out:
        iounmap(opregion->header);
        opregion->header = NULL;
+       acpi_video_register();
        return err;
 }