From: David Woodhouse Date: Thu, 12 Aug 2010 23:56:54 +0000 (+0100) Subject: Call acpi_video_register() in intel_opregion_init() failure path X-Git-Tag: MMI-PSA29.97-13-9~22545^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=54b9b308fa39e5147e2edde3492d8650b957be6c;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Acked-by: Jesse Barnes Acked-by: Matthew Garrett --- 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; }