git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-misc-next
[sfrench/cifs-2.6.git]
/
drivers
/
dma-buf
/
dma-resv.c
diff --git
a/drivers/dma-buf/dma-resv.c
b/drivers/dma-buf/dma-resv.c
index 42a8f3f1168133424091f35e011f58c2e757b890..709002515550cd2e6ff989a4c2bdd11b5b0cdf9c 100644
(file)
--- a/
drivers/dma-buf/dma-resv.c
+++ b/
drivers/dma-buf/dma-resv.c
@@
-471,7
+471,7
@@
unlock:
if (pfence_excl)
*pfence_excl = fence_excl;
else if (fence_excl)
- shared[
++shared_count
] = fence_excl;
+ shared[
shared_count++
] = fence_excl;
if (!shared_count) {
kfree(shared);