diff options
Diffstat (limited to 'drivers/gpu/drm/drm_ioctl.c')
-rw-r--r-- | drivers/gpu/drm/drm_ioctl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 4aafe4802099..af782911c505 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c | |||
@@ -509,7 +509,7 @@ int drm_ioctl_permit(u32 flags, struct drm_file *file_priv) | |||
509 | return -EACCES; | 509 | return -EACCES; |
510 | 510 | ||
511 | /* MASTER is only for master or control clients */ | 511 | /* MASTER is only for master or control clients */ |
512 | if (unlikely((flags & DRM_MASTER) && | 512 | if (unlikely((flags & DRM_MASTER) && |
513 | !drm_is_current_master(file_priv) && | 513 | !drm_is_current_master(file_priv) && |
514 | !drm_is_control_client(file_priv))) | 514 | !drm_is_control_client(file_priv))) |
515 | return -EACCES; | 515 | return -EACCES; |
@@ -704,7 +704,7 @@ static const struct drm_ioctl_desc drm_ioctls[] = { | |||
704 | * | 704 | * |
705 | * ##define DRM_IOCTL_MY_DRIVER_OPERATION \ | 705 | * ##define DRM_IOCTL_MY_DRIVER_OPERATION \ |
706 | * DRM_IOW(DRM_COMMAND_BASE, struct my_driver_operation) | 706 | * DRM_IOW(DRM_COMMAND_BASE, struct my_driver_operation) |
707 | * | 707 | * |
708 | * DRM driver private IOCTL must be in the range from DRM_COMMAND_BASE to | 708 | * DRM driver private IOCTL must be in the range from DRM_COMMAND_BASE to |
709 | * DRM_COMMAND_END. Finally you need an array of &struct drm_ioctl_desc to wire | 709 | * DRM_COMMAND_END. Finally you need an array of &struct drm_ioctl_desc to wire |
710 | * up the handlers and set the access rights:: | 710 | * up the handlers and set the access rights:: |
@@ -848,7 +848,7 @@ long drm_ioctl(struct file *filp, | |||
848 | if (kdata != stack_kdata) | 848 | if (kdata != stack_kdata) |
849 | kfree(kdata); | 849 | kfree(kdata); |
850 | if (retcode) | 850 | if (retcode) |
851 | DRM_DEBUG("ret = %d\n", retcode); | 851 | DRM_DEBUG("pid=%d, ret = %d\n", task_pid_nr(current), retcode); |
852 | return retcode; | 852 | return retcode; |
853 | } | 853 | } |
854 | EXPORT_SYMBOL(drm_ioctl); | 854 | EXPORT_SYMBOL(drm_ioctl); |