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

Commit d9213f6b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "asoc: flags is used but is uninitialized"

parents 8c500e2d f1a7ecab

asoc/msm-lsm-client.c

+1 −1
Original line number Diff line number Diff line
@@ -1252,7 +1252,7 @@ static int msm_lsm_ioctl_shared(struct snd_pcm_substream *substream, 
			 unsigned int cmd, void *arg)

{

	struct snd_soc_pcm_runtime *rtd;

	unsigned long flags;

	unsigned long flags = 0;

	int ret;

	struct snd_lsm_sound_model_v2 snd_model_v2;

	struct snd_lsm_session_data session_data;

asoc/msm-pcm-afe-v2.c

+2 −2
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static void pcm_afe_process_tx_pkt(uint32_t opcode, 
		 void *priv)

{

	struct pcm_afe_info *prtd = priv;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;

	struct snd_pcm_substream *substream = NULL;

	struct snd_pcm_runtime *runtime = NULL;

	uint16_t event;
@@ -255,7 +255,7 @@ static void pcm_afe_process_rx_pkt(uint32_t opcode, 
		 void *priv)

{

	struct pcm_afe_info *prtd = priv;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;

	struct snd_pcm_substream *substream = NULL;

	struct snd_pcm_runtime *runtime = NULL;

	struct snd_soc_pcm_runtime *rtd = NULL;

asoc/msm-pcm-dtmf-v2.c

+3 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2013-2014, 2017-2019 The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 2017-2020 The Linux Foundation. All rights reserved.

 */



#include <linux/init.h>
@@ -224,7 +224,7 @@ static int msm_pcm_capture_copy(struct snd_pcm_substream *substream, 
	struct dtmf_buf_node *buf_node = NULL;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct dtmf_drv_info *prtd = runtime->private_data;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;



	ret = wait_event_interruptible_timeout(prtd->out_wait,

				(!list_empty(&prtd->out_queue)),
@@ -324,7 +324,7 @@ static int msm_pcm_close(struct snd_pcm_substream *substream) 
	struct snd_pcm_substream *c_substream;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct dtmf_drv_info *prtd = runtime->private_data;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;



	pr_debug("%s() DTMF\n", __func__);

asoc/msm-pcm-host-voice-v2.c

+5 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/init.h>
@@ -678,7 +678,7 @@ static void hpcm_copy_capture_data_to_queue(struct dai_data *dai_data, 
					    uint32_t len)

{

	struct hpcm_buf_node *buf_node = NULL;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;



	if (dai_data->substream == NULL)

		return;
@@ -987,7 +987,7 @@ static int msm_pcm_close(struct snd_pcm_substream *substream) 
	struct snd_dma_buffer *dma_buf;

	struct snd_pcm_runtime *runtime;

	struct hpcm_drv *prtd;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;

	struct dai_data *dai_data = NULL;

	struct tap_point *tp = NULL;

	struct tappnt_mxr_data *tmd = NULL;
@@ -1077,7 +1077,7 @@ static int msm_pcm_playback_copy(struct snd_pcm_substream *substream, int a, 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct hpcm_drv *prtd = runtime->private_data;

	struct dai_data *dai_data = hpcm_get_dai_data(substream->pcm->id, prtd);

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;



	if (dai_data == NULL) {

		pr_err("%s, dai_data is null\n", __func__);
@@ -1129,7 +1129,7 @@ static int msm_pcm_capture_copy(struct snd_pcm_substream *substream, 
	struct snd_pcm_runtime *runtime = substream->runtime;

	struct hpcm_drv *prtd = runtime->private_data;

	struct dai_data *dai_data = hpcm_get_dai_data(substream->pcm->id, prtd);

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;



	if (dai_data == NULL) {

		pr_err("%s, dai_data is null\n", __func__);

asoc/msm-pcm-voip-v2.c

+5 −5
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/init.h>
@@ -508,7 +508,7 @@ static void voip_process_dl_pkt(uint8_t *voc_pkt, void *private_data) 
{

	struct voip_buf_node *buf_node = NULL;

	struct voip_drv_info *prtd = private_data;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;

	uint32_t rate_type;

	uint32_t frame_rate;

	u32 pkt_len;
@@ -778,7 +778,7 @@ static int msm_pcm_playback_copy(struct snd_pcm_substream *substream, int a, 
	struct voip_buf_node *buf_node = NULL;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct voip_drv_info *prtd = runtime->private_data;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;



	pr_debug("%s: fbytes=%lu\n", __func__, fbytes);
@@ -852,7 +852,7 @@ static int msm_pcm_capture_copy(struct snd_pcm_substream *substream, 
	struct voip_buf_node *buf_node = NULL;

	struct snd_pcm_runtime *runtime = substream->runtime;

	struct voip_drv_info *prtd = runtime->private_data;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;

	int size;



	pr_debug("%s: fbytes = %lu\n", __func__, fbytes);
@@ -941,7 +941,7 @@ static int msm_pcm_close(struct snd_pcm_substream *substream) 
	struct snd_pcm_substream *p_substream, *c_substream;

	struct snd_pcm_runtime *runtime;

	struct voip_drv_info *prtd;

	unsigned long dsp_flags;

	unsigned long dsp_flags = 0;



	if (substream == NULL) {

		pr_err("substream is NULL\n");