Merge "audio: fix member initialization" (60713cc6) · Commits · e / os / android_hardware_qcom_audio

hal/audio_hw.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -2807,6 +2807,9 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
		return -ENOMEM;
		}

		pthread_mutex_init(&out->lock, (const pthread_mutexattr_t *) NULL);
		pthread_cond_init(&out->cond, (const pthread_condattr_t *) NULL);

		if (devices == AUDIO_DEVICE_NONE)
		devices = AUDIO_DEVICE_OUT_SPEAKER;

		@@ -3078,9 +3081,6 @@ static int adev_open_output_stream(struct audio_hw_device *dev,
		/* out->muted = false; by calloc() */
		/* out->written = 0; by calloc() */

		pthread_mutex_init(&out->lock, (const pthread_mutexattr_t *) NULL);
		pthread_cond_init(&out->cond, (const pthread_condattr_t *) NULL);

		config->format = out->stream.common.get_format(&out->stream.common);
		config->channel_mask = out->stream.common.get_channels(&out->stream.common);
		config->sample_rate = out->stream.common.get_sample_rate(&out->stream.common);