summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Bestas <mkbestas@lineageos.org>2020-01-08 01:55:17 +0200
committerMichael Bestas <mkbestas@lineageos.org>2020-01-08 01:55:17 +0200
commit17c0c341a2d38b307e87300dab303c86b5dc1af3 (patch)
treec8bcc201d8a04caa9145151fae73f35955e0b3f9
parent173b0d50aef4555856c71c04d4ea29b0914fb673 (diff)
parent706e92d033a37130d80b606bdf27d6d99ceca7ae (diff)
downloadandroid_hardware_qcom_audio-17c0c341a2d38b307e87300dab303c86b5dc1af3.tar.gz
android_hardware_qcom_audio-17c0c341a2d38b307e87300dab303c86b5dc1af3.tar.bz2
android_hardware_qcom_audio-17c0c341a2d38b307e87300dab303c86b5dc1af3.zip
Merge tag 'android-10.0.0_r23' into staging/lineage-17.1_merge-android-10.0.0_r23
Android 10.0.0 release 23 * tag 'android-10.0.0_r23': audio: free and assign NULL to global static device pointer Change-Id: Ib07c17230f97f54746d3713c3137a04ca9428194
-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 58d8f856..1c99066f 100644
--- a/hal/audio_hw.c
+++ b/hal/audio_hw.c
@@ -6282,9 +6282,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);