diff options
Diffstat (limited to 'drivers/char/drm/r300_cmdbuf.c')
-rw-r--r-- | drivers/char/drm/r300_cmdbuf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/char/drm/r300_cmdbuf.c b/drivers/char/drm/r300_cmdbuf.c index 669aee68ce24..59b2944811c5 100644 --- a/drivers/char/drm/r300_cmdbuf.c +++ b/drivers/char/drm/r300_cmdbuf.c | |||
@@ -780,8 +780,7 @@ static int r300_scratch(drm_radeon_private_t *dev_priv, | |||
780 | * Called by the ioctl handler function radeon_cp_cmdbuf. | 780 | * Called by the ioctl handler function radeon_cp_cmdbuf. |
781 | */ | 781 | */ |
782 | int r300_do_cp_cmdbuf(struct drm_device *dev, | 782 | int r300_do_cp_cmdbuf(struct drm_device *dev, |
783 | DRMFILE filp, | 783 | struct drm_file *file_priv, |
784 | struct drm_file *filp_priv, | ||
785 | drm_radeon_kcmd_buffer_t *cmdbuf) | 784 | drm_radeon_kcmd_buffer_t *cmdbuf) |
786 | { | 785 | { |
787 | drm_radeon_private_t *dev_priv = dev->dev_private; | 786 | drm_radeon_private_t *dev_priv = dev->dev_private; |
@@ -884,9 +883,10 @@ int r300_do_cp_cmdbuf(struct drm_device *dev, | |||
884 | } | 883 | } |
885 | 884 | ||
886 | buf = dma->buflist[idx]; | 885 | buf = dma->buflist[idx]; |
887 | if (buf->filp != filp || buf->pending) { | 886 | if (buf->file_priv != file_priv || buf->pending) { |
888 | DRM_ERROR("bad buffer %p %p %d\n", | 887 | DRM_ERROR("bad buffer %p %p %d\n", |
889 | buf->filp, filp, buf->pending); | 888 | buf->file_priv, file_priv, |
889 | buf->pending); | ||
890 | ret = -EINVAL; | 890 | ret = -EINVAL; |
891 | goto cleanup; | 891 | goto cleanup; |
892 | } | 892 | } |