summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2020-01-02 13:29:52 -0800
committerXin Li <delphij@google.com>2020-01-02 23:04:47 +0000
commite0e43bbd9328a4f10ec871e7fcaa486647499276 (patch)
treea8a74695341d0d34df41377ed3ebcb0cc0791215
parentcb093868fceecef0031293ce9b09b4adea2f4748 (diff)
parent9ecdf72e8b88ae9110919033de60f4aa645fd9c4 (diff)
downloadaudio-e0e43bbd9328a4f10ec871e7fcaa486647499276.tar.gz
DO NOT MERGE - Merge QQ1A.200105.003 into stage-aosp-mastertmp_b_147314974
Merged-In: Ie5298d1d83de872c5a2eb64c35ca2a8fcfac0c75 Change-Id: Ic65f63d9900f79849c459573818942e7455ebf3f
-rw-r--r--hal/audio_hw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hal/audio_hw.c b/hal/audio_hw.c
index 13be7aa..cba2e10 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -6284,9 +6284,9 @@ static int adev_verify_devices(struct audio_device *adev)
static int adev_close(hw_device_t *device)
{
size_t i;
- struct audio_device *adev = (struct audio_device *)device;
+ struct audio_device *adev_temp = (struct audio_device *)device;
- if (!adev)
+ if (!adev_temp)
return 0;
pthread_mutex_lock(&adev_init_lock);