Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

gpu: ion: Don't call ion_buffer_put on error path

Browse source 
If dma_buf_fd fails, the dma_buf needs to be cleaned up by
calling dma_buf_put. dma_buf_put will call ion_dma_buf_release
which in turn calls ion_buffer_put to clean up the buffer
reference. Calling ion_buffer_put after dma_buf_put drops the
reference count by one more which is incorrect. Fix this by
getting rid of the extra ion_buffer_put call.

Change-Id: Ieb3a7b781bf2dc299c45384dbf0a12d186adeb22
Signed-off-by: Laura Abbott <lauraa@codeaurora.org>
This commit is contained in:
Laura Abbott 2012-08-01 18:06:18 -07:00 committed by Stephen Boyd
parent f66663a40c
commit 2f4bb0e8da
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/gpu/ion/ion.c
View file

@ -1307,10 +1307,9 @@ int ion_share_dma_buf(struct ion_client *client, struct ion_handle *handle)
return PTR_ERR(dmabuf);
}
fd = dma_buf_fd(dmabuf, O_CLOEXEC);
if (fd < 0) {
if (fd < 0)
dma_buf_put(dmabuf);
ion_buffer_put(buffer);
}
return fd;
}
EXPORT_SYMBOL(ion_share_dma_buf);