Merge "ASoC: dapm: Fix double lock of dapm mutex" (86fdf692) · Commits · e / devices / android_kernel_xiaomi_markw

sound/soc/soc-dapm.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -3628,10 +3628,8 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,
		{
		struct snd_soc_dapm_widget *w = dapm_find_widget(dapm, pin, true);

		mutex_lock_nested(&dapm->card->dapm_mutex, SND_SOC_DAPM_CLASS_RUNTIME);
		if (!w) {
		dev_err(dapm->dev, "ASoC: unknown pin %s\n", pin);
		mutex_unlock(&dapm->card->dapm_mutex);
		return -EINVAL;
		}

		@@ -3639,7 +3637,6 @@ int snd_soc_dapm_force_enable_pin_unlocked(struct snd_soc_dapm_context *dapm,
		w->connected = 1;
		w->force = 1;
		dapm_mark_dirty(w, "force enable");
		mutex_unlock(&dapm->card->dapm_mutex);

		return 0;
		}