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
This commit is contained in:
commit
3c0556e967
|
@ -6575,7 +6575,7 @@ static void ironlake_disable_rc6(struct drm_device *dev)
|
||||||
POSTING_READ(RSTDBYCTL);
|
POSTING_READ(RSTDBYCTL);
|
||||||
}
|
}
|
||||||
|
|
||||||
ironlake_disable_rc6(dev);
|
ironlake_teardown_rc6(dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
static int ironlake_setup_rc6(struct drm_device *dev)
|
static int ironlake_setup_rc6(struct drm_device *dev)
|
||||||
|
|
Loading…
Reference in New Issue