From ad3fc6e30f49d78ef4dfd968b0747c62563b7a79 Mon Sep 17 00:00:00 2001 From: Zhihai Xu Date: Tue, 25 Mar 2014 18:36:27 -0700 Subject: [PATCH] audio: fix set_parameters return value. xxx_set_parameters functions were returning the status returned by str_parms_create_str() which is incorrect. These functions should return 0 when no error occurs. Change-Id: I984d95457c985fbaf1a15baa522f8a84f99dd7c9 --- audio_a2dp_hw/audio_a2dp_hw.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/audio_a2dp_hw/audio_a2dp_hw.c b/audio_a2dp_hw/audio_a2dp_hw.c index cde56c199..0645201c0 100644 --- a/audio_a2dp_hw/audio_a2dp_hw.c +++ b/audio_a2dp_hw/audio_a2dp_hw.c @@ -583,7 +583,8 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) struct a2dp_stream_out *out = (struct a2dp_stream_out *)stream; struct str_parms *parms; char keyval[16]; - int retval = 0; + int retval; + int status = 0; INFO("state %d", out->state); @@ -612,7 +613,7 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) if (strcmp(keyval, "true") == 0) { if (out->state == AUDIO_A2DP_STATE_STARTED) - retval = suspend_audio_datapath(out, false); + status = suspend_audio_datapath(out, false); } else { @@ -622,14 +623,13 @@ static int out_set_parameters(struct audio_stream *stream, const char *kvpairs) if (out->state == AUDIO_A2DP_STATE_SUSPENDED) out->state = AUDIO_A2DP_STATE_STANDBY; /* Irrespective of the state, return 0 */ - retval = 0; } } pthread_mutex_unlock(&out->lock); str_parms_destroy(parms); - return retval; + return status; } static char * out_get_parameters(const struct audio_stream *stream, const char *keys) -- 2.11.0