Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 872422c1 authored Apr 10, 2017 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Apr 10, 2017

Merge "hal: add NULL check for stream in"

parents e2e45539 9f56667e

hal/msm8916/platform.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5496,9 +5496,9 @@ static bool platform_check_capture_codec_backend_cfg(struct audio_device* adev,
		/* update cfg against other existing capture usecases on same backend */
		list_for_each(node, &adev->usecase_list) {
		uc = node_to_item(node, struct audio_usecase, list);
		if (uc->type == PCM_CAPTURE &&
		backend_idx == platform_get_backend_index(uc->in_snd_device)) {
		in = (struct stream_in *) uc->stream.in;
		if (in != NULL && uc->type == PCM_CAPTURE &&
		backend_idx == platform_get_backend_index(uc->in_snd_device)) {
		uc_channels = audio_channel_count_from_in_mask(in->channel_mask);

		ALOGV("%s:txbecf: uc %s, id %d, sr %d, bw %d, ch %d, device %s",

hal/msm8974/platform.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -5362,9 +5362,9 @@ static bool platform_check_capture_codec_backend_cfg(struct audio_device* adev,
		/* update cfg against other existing capture usecases on same backend */
		list_for_each(node, &adev->usecase_list) {
		uc = node_to_item(node, struct audio_usecase, list);
		if (uc->type == PCM_CAPTURE &&
		backend_idx == platform_get_backend_index(uc->in_snd_device)) {
		in = (struct stream_in *) uc->stream.in;
		if (in != NULL && uc->type == PCM_CAPTURE &&
		backend_idx == platform_get_backend_index(uc->in_snd_device)) {
		uc_channels = audio_channel_count_from_in_mask(in->channel_mask);

		ALOGV("%s:txbecf: uc %s, id %d, sr %d, bw %d, ch %d, device %s",