Commit e26ad671 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-fix-v6.17-rc1' of... 

Merge tag 'asoc-fix-v6.17-rc1' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v6.17

A reasonably small collection of fixes that came in since the merge
window, mostly small and driver specific plus a cleanup of the menu
reorganisation to address some user confusion with the way the generic
drivers had been handled.
parents ee8f1613 47ed64db

sound/soc/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ source "sound/soc/bcm/Kconfig" 
source "sound/soc/cirrus/Kconfig"

source "sound/soc/dwc/Kconfig"

source "sound/soc/fsl/Kconfig"

source "sound/soc/generic/Kconfig"

source "sound/soc/google/Kconfig"

source "sound/soc/hisilicon/Kconfig"

source "sound/soc/jz4740/Kconfig"
@@ -149,5 +148,8 @@ source "sound/soc/codecs/Kconfig" 


source "sound/soc/sdw_utils/Kconfig"



# generic frame-work

source "sound/soc/generic/Kconfig"



endif	# SND_SOC

sound/soc/codecs/aw87390.c

+3 −5
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static int aw87390_profile_info(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);

	struct aw87390 *aw87390 = snd_soc_component_get_drvdata(codec);

	char *prof_name, *name;

	char *prof_name;

	int count, ret;



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -194,17 +194,15 @@ static int aw87390_profile_info(struct snd_kcontrol *kcontrol, 
	if (uinfo->value.enumerated.item >= count)

		uinfo->value.enumerated.item = count - 1;



	name = uinfo->value.enumerated.name;

	count = uinfo->value.enumerated.item;



	ret = aw87390_dev_get_prof_name(aw87390->aw_pa, count, &prof_name);

	if (ret) {

		strscpy(uinfo->value.enumerated.name, "null",

						strlen("null") + 1);

		strscpy(uinfo->value.enumerated.name, "null");

		return 0;

	}



	strscpy(name, prof_name, sizeof(uinfo->value.enumerated.name));

	strscpy(uinfo->value.enumerated.name, prof_name);



	return 0;

}

sound/soc/codecs/aw88081.c

+2 −3
Original line number Diff line number Diff line
@@ -914,12 +914,11 @@ static int aw88081_profile_info(struct snd_kcontrol *kcontrol, 


	ret = aw88081_dev_get_prof_name(aw88081->aw_pa, count, &prof_name);

	if (ret) {

		strscpy(uinfo->value.enumerated.name, "null",

						sizeof(uinfo->value.enumerated.name));

		strscpy(uinfo->value.enumerated.name, "null");

		return 0;

	}



	strscpy(uinfo->value.enumerated.name, prof_name, sizeof(uinfo->value.enumerated.name));

	strscpy(uinfo->value.enumerated.name, prof_name);



	return 0;

}

sound/soc/codecs/aw88166.c

+3 −5
Original line number Diff line number Diff line
@@ -1478,7 +1478,7 @@ static int aw88166_profile_info(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);

	struct aw88166 *aw88166 = snd_soc_component_get_drvdata(codec);

	char *prof_name, *name;

	char *prof_name;

	int count, ret;



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -1495,17 +1495,15 @@ static int aw88166_profile_info(struct snd_kcontrol *kcontrol, 
	if (uinfo->value.enumerated.item >= count)

		uinfo->value.enumerated.item = count - 1;



	name = uinfo->value.enumerated.name;

	count = uinfo->value.enumerated.item;



	ret = aw88166_dev_get_prof_name(aw88166->aw_pa, count, &prof_name);

	if (ret) {

		strscpy(uinfo->value.enumerated.name, "null",

						strlen("null") + 1);

		strscpy(uinfo->value.enumerated.name, "null");

		return 0;

	}



	strscpy(name, prof_name, sizeof(uinfo->value.enumerated.name));

	strscpy(uinfo->value.enumerated.name, prof_name);



	return 0;

}

sound/soc/codecs/aw88261.c

+3 −5
Original line number Diff line number Diff line
@@ -819,7 +819,7 @@ static int aw88261_profile_info(struct snd_kcontrol *kcontrol, 
{

	struct snd_soc_component *codec = snd_soc_kcontrol_component(kcontrol);

	struct aw88261 *aw88261 = snd_soc_component_get_drvdata(codec);

	char *prof_name, *name;

	char *prof_name;

	int count, ret;



	uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
@@ -836,17 +836,15 @@ static int aw88261_profile_info(struct snd_kcontrol *kcontrol, 
	if (uinfo->value.enumerated.item >= count)

		uinfo->value.enumerated.item = count - 1;



	name = uinfo->value.enumerated.name;

	count = uinfo->value.enumerated.item;



	ret = aw88261_dev_get_prof_name(aw88261->aw_pa, count, &prof_name);

	if (ret) {

		strscpy(uinfo->value.enumerated.name, "null",

						strlen("null") + 1);

		strscpy(uinfo->value.enumerated.name, "null");

		return 0;

	}



	strscpy(name, prof_name, sizeof(uinfo->value.enumerated.name));

	strscpy(uinfo->value.enumerated.name, prof_name);



	return 0;

}