diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2016-07-27 19:32:29 +0100 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2016-07-28 07:28:17 +0100 |
commit | 5b249600c1483976b0a7501ba25a8ba8b86672e1 (patch) | |
tree | af9a3dd636830179ad9d0f52c4910ef83a4b10c5 /drivers/gpu/drm | |
parent | 12c100bfa5d9103b6c4d43636fee09c31e75605a (diff) | |
download | linux-stable-5b249600c1483976b0a7501ba25a8ba8b86672e1.tar.gz linux-stable-5b249600c1483976b0a7501ba25a8ba8b86672e1.tar.bz2 linux-stable-5b249600c1483976b0a7501ba25a8ba8b86672e1.zip |
drm/i915: Fix up some stray to_i915(dev) after a recent merge
The merge conflict resolution caused some dev->dev_private to return
from the dead. Kill them with to_i915().
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/1469644349-24571-1-git-send-email-chris@chris-wilson.co.uk
Reviewed-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'drivers/gpu/drm')
-rw-r--r-- | drivers/gpu/drm/i915/i915_sysfs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index d47281b4b1c1..f1ffde7f7c0b 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c @@ -323,7 +323,7 @@ static ssize_t gt_boost_freq_mhz_store(struct device *kdev, { struct drm_minor *minor = dev_to_drm_minor(kdev); struct drm_device *dev = minor->dev; - struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_i915_private *dev_priv = to_i915(dev); u32 val; ssize_t ret; |