diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-10-20 11:32:58 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-10-20 11:32:58 -0700 |
| commit | 42ed9e9dbae89671344a227469c9ee7f367c1ff9 (patch) | |
| tree | 8e5eda6d3de09ea3107500844343f99de423388b | |
| parent | 794a90215c0166cfee281ce4e5b43e0275db3281 (diff) | |
| parent | 03a24a3a7009acae40a9a11a160cd5f5fce559d9 (diff) | |
Merge branch 'android-3.14' of ../../android/aosp into linux-linaro-lsk-v3.14-androidlsk-v3.14-15.10-android
| -rw-r--r-- | drivers/staging/android/ion/ion.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index e00e6e8f95e9..fa398ef8ae24 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -1167,13 +1167,13 @@ struct ion_handle *ion_import_dma_buf(struct ion_client *client, int fd) mutex_unlock(&client->lock); goto end; } - mutex_unlock(&client->lock); handle = ion_handle_create(client, buffer); - if (IS_ERR(handle)) + if (IS_ERR(handle)) { + mutex_unlock(&client->lock); goto end; + } - mutex_lock(&client->lock); ret = ion_handle_add(client, handle); mutex_unlock(&client->lock); if (ret) { |