Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6

[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 8fcc75c1aa2831be0bac489f9dd2043907d2cf69..ea5d3fea4b61a2cd56dc4d2da4bad6fe3d94ea43 100644 (file)
--- a/drivers/gpu/drm/i915/i915_opregion.c
+++ b/drivers/gpu/drm/i915/i915_opregion.c
@@ -114,10 +114,6 @@ struct opregion_asle {
 #define ASLE_REQ_MSK           0xf
 
 /* response bits of ASLE irq request */
-#define ASLE_ALS_ILLUM_FAIL    (2<<10)
-#define ASLE_BACKLIGHT_FAIL    (2<<12)
-#define ASLE_PFIT_FAIL         (2<<14)
-#define ASLE_PWM_FREQ_FAIL     (2<<16)
 #define ASLE_ALS_ILLUM_FAILED  (1<<10)
 #define ASLE_BACKLIGHT_FAILED  (1<<12)
 #define ASLE_PFIT_FAILED       (1<<14)
@@ -155,11 +151,11 @@ static u32 asle_set_backlight(struct drm_device *dev, u32 bclp)
        u32 max_backlight, level, shift;
 
        if (!(bclp & ASLE_BCLP_VALID))
-               return ASLE_BACKLIGHT_FAIL;
+               return ASLE_BACKLIGHT_FAILED;
 
        bclp &= ASLE_BCLP_MSK;
        if (bclp < 0 || bclp > 255)
-               return ASLE_BACKLIGHT_FAIL;
+               return ASLE_BACKLIGHT_FAILED;
 
        blc_pwm_ctl = I915_READ(BLC_PWM_CTL);
        blc_pwm_ctl2 = I915_READ(BLC_PWM_CTL2);
@@ -211,7 +207,7 @@ static u32 asle_set_pfit(struct drm_device *dev, u32 pfit)
        /* Panel fitting is currently controlled by the X code, so this is a
           noop until modesetting support works fully */
        if (!(pfit & ASLE_PFIT_VALID))
-               return ASLE_PFIT_FAIL;
+               return ASLE_PFIT_FAILED;
        return 0;
 }
 
@@ -535,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;
 }