diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-07-08 11:16:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-08 11:17:32 +1000 |
| commit | 21c355b09711e95f8f0e7c1890b343c6cd350042 (patch) | |
| tree | 6a836154558c8504e8cb68c0bfd5b4d358af5cf4 /include/linux/dma-resv.h | |
| parent | 5cebdea6f8cea0d167bf0b3535f9905c67e76e00 (diff) | |
| parent | f18f58012ee894039cd59ee8c889bf499d7a3943 (diff) | |
Merge tag 'drm-misc-next-fixes-2021-07-01' of git://anongit.freedesktop.org/drm/drm-misc into drm-nextdrm-next-2021-07-08-1
Short summary of fixes pull:
* amdgpu: TTM fixes
* dma-buf: Doc fixes
* gma500: Fix potential BO leaks in error handling
* radeon: Fix NULL-ptr deref
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/YN2GK2SH64yqXqh9@linux-uq9g
Diffstat (limited to 'include/linux/dma-resv.h')
| -rw-r--r-- | include/linux/dma-resv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h index 562b885cf9c3..e1ca2080a1ff 100644 --- a/include/linux/dma-resv.h +++ b/include/linux/dma-resv.h @@ -212,7 +212,7 @@ static inline void dma_resv_unlock(struct dma_resv *obj) } /** - * dma_resv_exclusive - return the object's exclusive fence + * dma_resv_excl_fence - return the object's exclusive fence * @obj: the reservation object * * Returns the exclusive fence (if any). Caller must either hold the objects |