diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2013-12-11 11:34:44 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-12-18 02:35:01 +0100 |
| commit | 1d6ac185c32134233f77ce44800ceb4ab9361401 (patch) | |
| tree | 189d3bac69aa35ed8e8f3f249c0d79a751351d5a /drivers/gpu/drm/drm_buffer.c | |
| parent | drm: Kill DRM_WAKUP and DRM_INIT_WAITQUEUE (diff) | |
| download | linux-1d6ac185c32134233f77ce44800ceb4ab9361401.tar.xz linux-1d6ac185c32134233f77ce44800ceb4ab9361401.zip | |
drm: Kill DRM_COPY_(TO|FROM)_USER
Less yelling ftw!
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/drm_buffer.c')
| -rw-r--r-- | drivers/gpu/drm/drm_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c index 39a718340319..0406110f83ed 100644 --- a/drivers/gpu/drm/drm_buffer.c +++ b/drivers/gpu/drm/drm_buffer.c @@ -114,7 +114,7 @@ int drm_buffer_copy_from_user(struct drm_buffer *buf, for (idx = 0; idx < nr_pages; ++idx) { - if (DRM_COPY_FROM_USER(buf->data[idx], + if (copy_from_user(buf->data[idx], user_data + idx * PAGE_SIZE, min(PAGE_SIZE, size - idx * PAGE_SIZE))) { DRM_ERROR("Failed to copy user data (%p) to drm buffer" |