| commit | 0ab9c38fc93b0c5a2fe4e9db694af171907726aa | [log] [tgz] |
|---|---|---|
| author | Glenn Kasten <gkasten@google.com> | Tue Feb 04 01:20:26 2014 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 04 01:20:26 2014 +0000 |
| tree | 6d1018508d6f4ca83fa4d891169e8cf0d5b97611 | |
| parent | 06c72f6bd7d19f1504ce080cffbfa281992dd603 [diff] | |
| parent | f9953b7d52bcf560b15efde807f41cf0903e875d [diff] |
Merge "usbaudio: fix for out->dev->lock remains locked in error case"
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 @@ 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));