author | jian.xu <jian.xu@amlogic.com> | 2014-03-21 07:30:59 (GMT) |
---|---|---|
committer | Sandy lUo <sandy.luo@amlogic.com> | 2014-03-21 09:49:38 (GMT) |
commit | 8eb63057719cb1da18e6c457f12c32154ef0afd9 (patch) | |
tree | 8fff7a966396edbcf08d3678ee783f014db157e3 | |
parent | 7c6ad2fbf1613923dcba1c4c7545bb1b90c0c13a (diff) | |
download | audio-8eb63057719cb1da18e6c457f12c32154ef0afd9.zip audio-8eb63057719cb1da18e6c457f12c32154ef0afd9.tar.gz audio-8eb63057719cb1da18e6c457f12c32154ef0afd9.tar.bz2 |
PD # 89100 : fix audio flinger set parameter return fail error
-rwxr-xr-x | audio_hw.c | 3 | ||||
-rwxr-xr-x | hdmi_audio_hw.c | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -833,6 +833,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) pthread_mutex_unlock(&in->lock); } pthread_mutex_unlock(&adev->lock); + goto exit; } int sr = 0; ret = str_parms_get_int(parms, AUDIO_PARAMETER_STREAM_SAMPLING_RATE, &sr); @@ -854,6 +855,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) pthread_mutex_unlock(&out->lock); } + goto exit; } int frame_size = 0; ret = str_parms_get_int(parms, AUDIO_PARAMETER_STREAM_FRAME_COUNT, &frame_size); @@ -876,6 +878,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) } } +exit: str_parms_destroy(parms); return ret; } diff --git a/hdmi_audio_hw.c b/hdmi_audio_hw.c index 9666931..e8c53a2 100755 --- a/hdmi_audio_hw.c +++ b/hdmi_audio_hw.c @@ -830,6 +830,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) pthread_mutex_unlock(&in->lock); } pthread_mutex_unlock(&adev->lock); + goto exit; } int sr = 0; ret = str_parms_get_int(parms, AUDIO_PARAMETER_STREAM_SAMPLING_RATE, &sr); @@ -850,6 +851,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) pthread_mutex_unlock(&out->lock); } + goto exit; } int frame_size = 0; ret = str_parms_get_int(parms, AUDIO_PARAMETER_STREAM_FRAME_COUNT, &frame_size); @@ -871,6 +873,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) } } +exit: str_parms_destroy(parms); return ret; } |