Merge drm/drm-next into drm-misc-next

[linux-2.6-microblaze.git] / include / linux / dma-resv.h

diff --git a/include/linux/dma-resv.h b/include/linux/dma-resv.h
index 45f1d48..dbd235a 100644 (file)
--- a/include/linux/dma-resv.h
+++ b/include/linux/dma-resv.h
@@ -380,7 +380,7 @@ static inline int dma_resv_lock_slow_interruptible(struct dma_resv *obj,
  */
 static inline bool __must_check dma_resv_trylock(struct dma_resv *obj)
 {
-       return ww_mutex_trylock(&obj->lock);
+       return ww_mutex_trylock(&obj->lock, NULL);
 }
 
 /**