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

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

Merge "ASoC: add null check for component prefix"

parents 4e91300a 91ba27ca

asoc/codecs/swr-dmic.c

+22 −15
Original line number Diff line number Diff line
@@ -33,6 +33,8 @@ 
#define NUM_ATTEMPTS 5

#define SWRS_SCP_CONTROL    0x44



#define MAX_NAME_LEN 40



static int swr_master_channel_map[] = {

	ZERO,

	SWRM_TX1_CH1,
@@ -294,32 +296,37 @@ static int swr_dmic_codec_probe(struct snd_soc_component *component) 
			snd_soc_component_get_drvdata(component);

	struct snd_soc_dapm_context *dapm =

			snd_soc_component_get_dapm(component);

	char w_name[100];

	char w_name[MAX_NAME_LEN];



	if (!swr_dmic)

		return -EINVAL;



	swr_dmic->component = component;

	snd_soc_dapm_ignore_suspend(dapm,

				swr_dmic->dai_driver->capture.stream_name);

	memset(w_name, 0, 100);

	strlcpy(w_name, component->name_prefix, 100);

	strlcat(w_name, " SWR_DMIC", 100);

	if (!component->name_prefix) {

		dev_err(component->dev, "%s: component prefix is NULL\n", __func__);

		return -EPROBE_DEFER;

	}



	memset(w_name, 0, sizeof(w_name));

	strlcpy(w_name, component->name_prefix, sizeof(w_name));

	strlcat(w_name, " ", sizeof(w_name));

	strlcat(w_name, swr_dmic->dai_driver->capture.stream_name,

				sizeof(w_name));

	snd_soc_dapm_ignore_suspend(dapm, w_name);



	memset(w_name, 0, 100);

	strlcpy(w_name, component->name_prefix, 100);

	strlcat(w_name, " SMIC_SUPPLY", 100);

	memset(w_name, 0, sizeof(w_name));

	strlcpy(w_name, component->name_prefix, sizeof(w_name));

	strlcat(w_name, " SWR_DMIC", sizeof(w_name));

	snd_soc_dapm_ignore_suspend(dapm, w_name);



	memset(w_name, 0, 100);

	strlcpy(w_name, component->name_prefix, 100);

	strlcat(w_name, " SMIC_PORT_EN", 100);

	memset(w_name, 0, sizeof(w_name));

	strlcpy(w_name, component->name_prefix, sizeof(w_name));

	strlcat(w_name, " SMIC_PORT_EN", sizeof(w_name));

	snd_soc_dapm_ignore_suspend(dapm, w_name);



	memset(w_name, 0, 100);

	strlcpy(w_name, component->name_prefix, 100);

	strlcat(w_name, " SWR_DMIC_OUTPUT", 100);

	memset(w_name, 0, sizeof(w_name));

	strlcpy(w_name, component->name_prefix, sizeof(w_name));

	strlcat(w_name, " SWR_DMIC_OUTPUT", sizeof(w_name));

	snd_soc_dapm_ignore_suspend(dapm, w_name);



	snd_soc_dapm_sync(dapm);

asoc/codecs/wsa883x/wsa883x.c

+17 −13
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ 
#define TEMP_INVALID	0xFFFF

#define WSA883X_TEMP_RETRY 3



#define MAX_NAME_LEN	30

#define MAX_NAME_LEN	40

#define WSA883X_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_16000 |\

			SNDRV_PCM_RATE_32000 | SNDRV_PCM_RATE_48000 |\

			SNDRV_PCM_RATE_96000 | SNDRV_PCM_RATE_192000 |\
@@ -1219,12 +1219,12 @@ static int wsa883x_get_temperature(struct snd_soc_component *component, 


static int wsa883x_codec_probe(struct snd_soc_component *component)

{

	char w_name[MAX_NAME_LEN];

	struct wsa883x_priv *wsa883x = snd_soc_component_get_drvdata(component);

	struct swr_device *dev;

	int variant = 0, version = 0;

	struct snd_soc_dapm_context *dapm =

			snd_soc_component_get_dapm(component);

	char w_name[100];



	if (!wsa883x)

		return -EINVAL;
@@ -1248,22 +1248,26 @@ static int wsa883x_codec_probe(struct snd_soc_component *component) 
	wsa883x_codec_init(component);

	wsa883x->global_pa_cnt = 0;



	snd_soc_dapm_ignore_suspend(dapm,

		wsa883x->dai_driver->playback.stream_name);

	memset(w_name, 0, sizeof(w_name));

	strlcpy(w_name, component->name_prefix, sizeof(w_name));

	strlcat(w_name, " ", sizeof(w_name));

	strlcat(w_name, wsa883x->dai_driver->playback.stream_name,

				sizeof(w_name));

	snd_soc_dapm_ignore_suspend(dapm, w_name);



	memset(w_name, 0, 100);

	strlcpy(w_name, component->name_prefix, 100);

	strlcat(w_name, " IN", 100);

	memset(w_name, 0, sizeof(w_name));

	strlcpy(w_name, component->name_prefix, sizeof(w_name));

	strlcat(w_name, " IN", sizeof(w_name));

	snd_soc_dapm_ignore_suspend(dapm, w_name);



	memset(w_name, 0, 100);

	strlcpy(w_name, component->name_prefix, 100);

	strlcat(w_name, " SWR DAC_PORT", 100);

	memset(w_name, 0, sizeof(w_name));

	strlcpy(w_name, component->name_prefix, sizeof(w_name));

	strlcat(w_name, " SWR DAC_PORT", sizeof(w_name));

	snd_soc_dapm_ignore_suspend(dapm, w_name);



	memset(w_name, 0, 100);

	strlcpy(w_name, component->name_prefix, 100);

	strlcat(w_name, " SPKR", 100);

	memset(w_name, 0, sizeof(w_name));

	strlcpy(w_name, component->name_prefix, sizeof(w_name));

	strlcat(w_name, " SPKR", sizeof(w_name));

	snd_soc_dapm_ignore_suspend(dapm, w_name);



	snd_soc_dapm_sync(dapm);