diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:17:02 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:17:02 +0100 |
| commit | d61b5d546af21e886aafcc9182f5ac5935a3177d (patch) | |
| tree | 448b389768a74efb604dd22ea2a5d43686ea3be5 /drivers/staging/android/ion | |
| parent | staging: erofs: fix potential double iput in erofs_read_super() (diff) | |
| parent | Linux 5.0-rc4 (diff) | |
| download | linux-dev-d61b5d546af21e886aafcc9182f5ac5935a3177d.tar.xz linux-dev-d61b5d546af21e886aafcc9182f5ac5935a3177d.zip | |
Merge 5.0-rc4 into staging-next
We need the staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/android/ion')
| -rw-r--r-- | drivers/staging/android/ion/ion.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index bba5f682bc25..92c2914239e3 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -245,10 +245,10 @@ static void ion_dma_buf_detatch(struct dma_buf *dmabuf, struct ion_dma_buf_attachment *a = attachment->priv; struct ion_buffer *buffer = dmabuf->priv; - free_duped_table(a->table); mutex_lock(&buffer->lock); list_del(&a->list); mutex_unlock(&buffer->lock); + free_duped_table(a->table); kfree(a); } |