Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus (6374fda1) · Commits · e / devices / android_kernel_fairphone_FP4

sound/soc/intel/boards/cht_bsw_rt5645.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -367,8 +367,12 @@ static int snd_cht_mc_probe(struct platform_device *pdev)
		}
		card->dev = &pdev->dev;
		sprintf(codec_name, "i2c-%s:00", drv->acpi_card->codec_id);

		/* set correct codec name */
		strcpy((char *)card->dai_link[2].codec_name, codec_name);
		for (i = 0; i < ARRAY_SIZE(cht_dailink); i++)
		if (!strcmp(card->dai_link[i].codec_name, "i2c-10EC5645:00"))
		card->dai_link[i].codec_name = kstrdup(codec_name, GFP_KERNEL);

		snd_soc_card_set_drvdata(card, drv);
		ret_val = devm_snd_soc_register_card(&pdev->dev, card);
		if (ret_val) {

sound/soc/intel/boards/mfld_machine.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ static const struct soc_enum lo_enum =
		static int headset_get_switch(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		ucontrol->value.integer.value[0] = hs_switch;
		ucontrol->value.enumerated.item[0] = hs_switch;
		return 0;
		}

		@@ -104,12 +104,12 @@ static int headset_set_switch(struct snd_kcontrol *kcontrol,
		struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
		struct snd_soc_dapm_context *dapm = &card->dapm;

		if (ucontrol->value.integer.value[0] == hs_switch)
		if (ucontrol->value.enumerated.item[0] == hs_switch)
		return 0;

		snd_soc_dapm_mutex_lock(dapm);

		if (ucontrol->value.integer.value[0]) {
		if (ucontrol->value.enumerated.item[0]) {
		pr_debug("hs_set HS path\n");
		snd_soc_dapm_enable_pin_unlocked(dapm, "Headphones");
		snd_soc_dapm_disable_pin_unlocked(dapm, "EPOUT");
		@@ -123,7 +123,7 @@ static int headset_set_switch(struct snd_kcontrol *kcontrol,

		snd_soc_dapm_mutex_unlock(dapm);

		hs_switch = ucontrol->value.integer.value[0];
		hs_switch = ucontrol->value.enumerated.item[0];

		return 0;
		}
		@@ -148,7 +148,7 @@ static void lo_enable_out_pins(struct snd_soc_dapm_context *dapm)
		static int lo_get_switch(struct snd_kcontrol *kcontrol,
		struct snd_ctl_elem_value *ucontrol)
		{
		ucontrol->value.integer.value[0] = lo_dac;
		ucontrol->value.enumerated.item[0] = lo_dac;
		return 0;
		}

		@@ -158,7 +158,7 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol,
		struct snd_soc_card *card = snd_kcontrol_chip(kcontrol);
		struct snd_soc_dapm_context *dapm = &card->dapm;

		if (ucontrol->value.integer.value[0] == lo_dac)
		if (ucontrol->value.enumerated.item[0] == lo_dac)
		return 0;

		snd_soc_dapm_mutex_lock(dapm);
		@@ -168,7 +168,7 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol,
		*/
		lo_enable_out_pins(dapm);

		switch (ucontrol->value.integer.value[0]) {
		switch (ucontrol->value.enumerated.item[0]) {
		case 0:
		pr_debug("set vibra path\n");
		snd_soc_dapm_disable_pin_unlocked(dapm, "VIB1OUT");
		@@ -202,7 +202,7 @@ static int lo_set_switch(struct snd_kcontrol *kcontrol,

		snd_soc_dapm_mutex_unlock(dapm);

		lo_dac = ucontrol->value.integer.value[0];
		lo_dac = ucontrol->value.enumerated.item[0];
		return 0;
		}

sound/soc/intel/skylake/skl-topology.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -978,7 +978,7 @@ static int skl_tplg_tlv_control_set(struct snd_kcontrol *kcontrol,
		return -EFAULT;
		} else {
		if (copy_from_user(ac->params,
		data + 2 * sizeof(u32), size))
		data + 2, size))
		return -EFAULT;
		}