aboutsummaryrefslogtreecommitdiff
path: root/drivers/gpu/drm
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-02-25 08:40:26 +1000
committerDave Airlie <airlied@redhat.com>2011-02-25 08:40:26 +1000
commit3c0556e9673f79e386b27768e27d18b3ce29e40e (patch)
tree2fd33a82b46f27ff350c0de0b7b1c698c5b64c80 /drivers/gpu/drm
parentfbf92bea68830c12da9099d7c8a60812194efc4e (diff)
parent995073072c2ae72255b595b192cc63f43fd386ef (diff)
downloadlinux-2.6.38-lt-ux500-3c0556e9673f79e386b27768e27d18b3ce29e40e.tar.gz
Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel into drm-fixes
* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel: drm/i915: Fix unintended recursion in ironlake_disable_rc6
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r--drivers/gpu/drm/i915/intel_display.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 9ca1bb2554f..e79b25bbee6 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -6575,7 +6575,7 @@ static void ironlake_disable_rc6(struct drm_device *dev)
POSTING_READ(RSTDBYCTL);
}
- ironlake_disable_rc6(dev);
+ ironlake_teardown_rc6(dev);
}
static int ironlake_setup_rc6(struct drm_device *dev)