aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_opregion.c
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2010-08-13 00:56:54 +0100
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-08-13 01:10:10 +0100
commit54b9b308fa39e5147e2edde3492d8650b957be6c (patch)
tree57b2b742864296233efc5033511b3a14b8717160 /drivers/gpu/drm/i915/i915_opregion.c
parentideapad: Only allow camera state to be set to 0 or 1 (diff)
downloadlinux-dev-54b9b308fa39e5147e2edde3492d8650b957be6c.tar.xz
linux-dev-54b9b308fa39e5147e2edde3492d8650b957be6c.zip
Call acpi_video_register() in intel_opregion_init() failure path
If i915 opregion is present, the acpi_video driver doesn't register itself immediately; it defers that until the i915 opregion code is done. But if that *fails*, the acpi_video driver was never getting registered. And thus I have no backlight support on my Lenovo IdeaPad S10-3. Call acpi_video_register() on the failure path, and it works again. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org> Acked-by: Matthew Garrett <mjg@redhat.com>
Diffstat (limited to '')
-rw-r--r--drivers/gpu/drm/i915/i915_opregion.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_opregion.c b/drivers/gpu/drm/i915/i915_opregion.c
index 8fcc75c1aa28..d1bf92b99788 100644
--- a/drivers/gpu/drm/i915/i915_opregion.c
+++ b/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;
}