| commit | 5b249600c1483976b0a7501ba25a8ba8b86672e1 | [log] [tgz] |
|---|---|---|
| author | Chris Wilson <chris@chris-wilson.co.uk> | Wed Jul 27 19:32:29 2016 +0100 |
| committer | Chris Wilson <chris@chris-wilson.co.uk> | Thu Jul 28 07:28:17 2016 +0100 |
| tree | af9a3dd636830179ad9d0f52c4910ef83a4b10c5 | |
| parent | 12c100bfa5d9103b6c4d43636fee09c31e75605a [diff] |
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>
diff --git a/drivers/gpu/drm/i915/i915_sysfs.c b/drivers/gpu/drm/i915/i915_sysfs.c index d47281b..f1ffde7 100644 --- a/drivers/gpu/drm/i915/i915_sysfs.c +++ b/drivers/gpu/drm/i915/i915_sysfs.c
@@ -323,7 +323,7 @@ { 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;