projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
i915
/
i915_sysfs.c
diff --git
a/drivers/gpu/drm/i915/i915_sysfs.c
b/drivers/gpu/drm/i915/i915_sysfs.c
index
ae7fd8f
..
503847f
100644
(file)
--- a/
drivers/gpu/drm/i915/i915_sysfs.c
+++ b/
drivers/gpu/drm/i915/i915_sysfs.c
@@
-540,7
+540,7
@@
static ssize_t error_state_read(struct file *filp, struct kobject *kobj,
memset(&error_priv, 0, sizeof(error_priv));
- ret = i915_error_state_buf_init(&error_str, count, off);
+ ret = i915_error_state_buf_init(&error_str,
to_i915(dev),
count, off);
if (ret)
return ret;