diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-15 21:43:49 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-11-15 21:43:49 +0000 |
| commit | 706e92d033a37130d80b606bdf27d6d99ceca7ae (patch) | |
| tree | 56cb73a9204bdf3bd3019b7d5d0eb43ea89f6ce6 | |
| parent | 2ea16ffc94dde200c2ab84c83210b82b1a953860 (diff) | |
| parent | bdcd0cec60e1d56da76816d5b8717d8b68fdaf2e (diff) | |
| download | android_hardware_qcom_audio-706e92d033a37130d80b606bdf27d6d99ceca7ae.tar.gz android_hardware_qcom_audio-706e92d033a37130d80b606bdf27d6d99ceca7ae.tar.bz2 android_hardware_qcom_audio-706e92d033a37130d80b606bdf27d6d99ceca7ae.zip | |
Merge cherrypicks of [9739231, 9739679, 9739582, 9739066] into qt-qpr1-b-release
Change-Id: Id70cb6a90b3aad2e0da0fef979bff291d96d8d3f
| -rw-r--r-- | hal/audio_hw.c | 4 |
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); |