diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-01-23 10:19:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-01-23 10:19:45 +1000 |
| commit | 618a6109ecb7fccba155f59675ee7092b2e338a2 (patch) | |
| tree | c922161576a5f25baa071e771089886df2062c5b /drivers/gpu/drm/amd/amdkfd/kfd_events.c | |
| parent | 01f5e6912c8abc8a23248e6cf66939756f0fb27c (diff) | |
| parent | 8bf793883da213864efc50c274d2b38ec0ca58b2 (diff) | |
Merge tag 'drm-amdkfd-next-2017-01-16' of git://people.freedesktop.org/~gabbayo/linux into drm-next
two amdkfd patches.
* tag 'drm-amdkfd-next-2017-01-16' of git://people.freedesktop.org/~gabbayo/linux:
drm/amdkfd: fix improper return value on error
amdkfd: fix spelling mistake in kfd_ioctl_dbg_unrgesiter
Diffstat (limited to 'drivers/gpu/drm/amd/amdkfd/kfd_events.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c index a6a4b2b1c0d9..6a3470f84998 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c @@ -739,8 +739,10 @@ int kfd_wait_on_events(struct kfd_process *p, struct kfd_event_data event_data; if (copy_from_user(&event_data, &events[i], - sizeof(struct kfd_event_data))) + sizeof(struct kfd_event_data))) { + ret = -EFAULT; goto fail; + } ret = init_event_waiter(p, &event_waiters[i], event_data.event_id, i); |