Merge remote-tracking branch 'asoc/fix/dapm' into asoc-linus (08d0a975) · Commits · e / devices / android_kernel_oneplus_sm7250

sound/soc/soc-dapm.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -2733,7 +2733,7 @@ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
		}

		mutex_unlock(&card->dapm_mutex);
		return 0;
		return change;
		}
		EXPORT_SYMBOL_GPL(snd_soc_dapm_put_volsw);

		@@ -2861,7 +2861,6 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
		struct soc_enum *e =
		(struct soc_enum *)kcontrol->private_value;
		int change;
		int ret = 0;
		int wi;

		if (ucontrol->value.enumerated.item[0] >= e->max)
		@@ -2881,7 +2880,7 @@ int snd_soc_dapm_put_enum_virt(struct snd_kcontrol *kcontrol,
		}

		mutex_unlock(&card->dapm_mutex);
		return ret;
		return change;
		}
		EXPORT_SYMBOL_GPL(snd_soc_dapm_put_enum_virt);