projects
/
platform
/
kernel
/
linux-rpi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'uaccess.comedi' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[platform/kernel/linux-rpi.git]
/
drivers
/
dma-buf
/
dma-fence.c
diff --git
a/drivers/dma-buf/dma-fence.c
b/drivers/dma-buf/dma-fence.c
index
052a41e
..
90edf2b
100644
(file)
--- a/
drivers/dma-buf/dma-fence.c
+++ b/
drivers/dma-buf/dma-fence.c
@@
-106,7
+106,7
@@
EXPORT_SYMBOL(dma_fence_get_stub);
u64 dma_fence_context_alloc(unsigned num)
{
WARN_ON(!num);
- return atomic64_
add_return(num, &dma_fence_context_counter) - num
;
+ return atomic64_
fetch_add(num, &dma_fence_context_counter)
;
}
EXPORT_SYMBOL(dma_fence_context_alloc);