diff options
| author | Eric Laurent <elaurent@google.com> | 2012-05-02 14:13:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-05-02 14:13:20 -0700 |
| commit | 1e9df538601af4b1947cf120470f59eae939c25e (patch) | |
| tree | 454d2f82d3ce49ca37668325353676841e4a1345 | |
| parent | 9e45c29880f4e4e81cb2c3ce99e4560bfe731745 (diff) | |
| parent | 079bd66e0f13371cce8693e8ea79d5a75be02942 (diff) | |
| download | device_samsung_tuna-1e9df538601af4b1947cf120470f59eae939c25e.zip device_samsung_tuna-1e9df538601af4b1947cf120470f59eae939c25e.tar.gz device_samsung_tuna-1e9df538601af4b1947cf120470f59eae939c25e.tar.bz2 | |
Merge "audio: fix memory leak." into jb-dev
| -rw-r--r-- | audio/audio_hw.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/audio/audio_hw.c b/audio/audio_hw.c index 7a24bcf..b507a59 100644 --- a/audio/audio_hw.c +++ b/audio/audio_hw.c @@ -2899,16 +2899,20 @@ static int adev_open_output_stream(struct audio_hw_device *dev, if (flags & AUDIO_OUTPUT_FLAG_DEEP_BUFFER) { ALOGV("adev_open_output_stream() deep buffer"); - if (ladev->outputs[OUTPUT_DEEP_BUF] != NULL) - return -ENOSYS; + if (ladev->outputs[OUTPUT_DEEP_BUF] != NULL) { + ret = -ENOSYS; + goto err_open; + } output_type = OUTPUT_DEEP_BUF; out->stream.common.get_buffer_size = out_get_buffer_size_deep_buffer; out->stream.get_latency = out_get_latency_deep_buffer; out->stream.write = out_write_deep_buffer; } else { ALOGV("adev_open_output_stream() normal buffer"); - if (ladev->outputs[OUTPUT_LOW_LATENCY] != NULL) - return -ENOSYS; + if (ladev->outputs[OUTPUT_LOW_LATENCY] != NULL) { + ret = -ENOSYS; + goto err_open; + } output_type = OUTPUT_LOW_LATENCY; out->stream.common.get_buffer_size = out_get_buffer_size_low_latency; out->stream.get_latency = out_get_latency_low_latency; |