git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'stable/ia64', 'stable/blkfront-cleanup' and 'stable/cleanup' of git...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
drm_fops.c
diff --git
a/drivers/gpu/drm/drm_fops.c
b/drivers/gpu/drm/drm_fops.c
index
a39794b
..
2ec7d48
100644
(file)
--- a/
drivers/gpu/drm/drm_fops.c
+++ b/
drivers/gpu/drm/drm_fops.c
@@
-236,6
+236,8
@@
static int drm_open_helper(struct inode *inode, struct file *filp,
return -EBUSY; /* No exclusive opens */
if (!drm_cpu_valid())
return -EINVAL;
return -EBUSY; /* No exclusive opens */
if (!drm_cpu_valid())
return -EINVAL;
+ if (dev->switch_power_state != DRM_SWITCH_POWER_ON)
+ return -EINVAL;
DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor_id);
DRM_DEBUG("pid = %d, minor = %d\n", task_pid_nr(current), minor_id);