summaryrefslogtreecommitdiffstats
path: root/modules/usbaudio
diff options
context:
space:
mode:
authorAmit Shekhar <ashekhar@codeaurora.org>2014-03-06 21:02:36 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-03-06 21:02:36 +0000
commitee4e28c9ebc7f26a1a25d1042d5a941139055447 (patch)
treebffe04c7b6a74afdaf575a61b79a2f29f79f2298 /modules/usbaudio
parent5f9a7907844ba5319957dd9913ef951d78709afb (diff)
parent1482406b70a254fc85d153a7066d7f90d724d195 (diff)
downloadhardware_libhardware-ee4e28c9ebc7f26a1a25d1042d5a941139055447.zip
hardware_libhardware-ee4e28c9ebc7f26a1a25d1042d5a941139055447.tar.gz
hardware_libhardware-ee4e28c9ebc7f26a1a25d1042d5a941139055447.tar.bz2
am 1482406b: usbaudio: fix for out->dev->lock remains locked in error case
* commit '1482406b70a254fc85d153a7066d7f90d724d195': usbaudio: fix for out->dev->lock remains locked in error case
Diffstat (limited to 'modules/usbaudio')
-rw-r--r--modules/usbaudio/audio_hw.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/usbaudio/audio_hw.c b/modules/usbaudio/audio_hw.c
index f33c343..24a2d63 100644
--- a/modules/usbaudio/audio_hw.c
+++ b/modules/usbaudio/audio_hw.c
@@ -212,7 +212,7 @@ static ssize_t out_write(struct audio_stream_out *stream, const void* buffer,
err:
pthread_mutex_unlock(&out->lock);
-
+ pthread_mutex_unlock(&out->dev->lock);
if (ret != 0) {
usleep(bytes * 1000000 / audio_stream_frame_size(&stream->common) /
out_get_sample_rate(&stream->common));