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

Commit 30686c35 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

ASoC: dapm: Correct regulator bypass error messages 



The error messages for bypassing/unbypassing a regulator appear to be
swapped round, this patch corrects these.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59

sound/soc/soc-dapm.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1218,7 +1218,7 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w, 
			ret = regulator_allow_bypass(w->regulator, false);

			ret = regulator_allow_bypass(w->regulator, false);

			if (ret != 0)

			if (ret != 0)

				dev_warn(w->dapm->dev,

				dev_warn(w->dapm->dev,

					 "ASoC: Failed to bypass %s: %d\n",

					 "ASoC: Failed to unbypass %s: %d\n",

					 w->name, ret);

					 w->name, ret);

		}

		}
@@ -1228,7 +1228,7 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w, 
			ret = regulator_allow_bypass(w->regulator, true);

			ret = regulator_allow_bypass(w->regulator, true);

			if (ret != 0)

			if (ret != 0)

				dev_warn(w->dapm->dev,

				dev_warn(w->dapm->dev,

					 "ASoC: Failed to unbypass %s: %d\n",

					 "ASoC: Failed to bypass %s: %d\n",

					 w->name, ret);

					 w->name, ret);

		}

		}
@@ -3248,7 +3248,7 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, 
			ret = regulator_allow_bypass(w->regulator, true);

			ret = regulator_allow_bypass(w->regulator, true);

			if (ret != 0)

			if (ret != 0)

				dev_warn(w->dapm->dev,

				dev_warn(w->dapm->dev,

					 "ASoC: Failed to unbypass %s: %d\n",

					 "ASoC: Failed to bypass %s: %d\n",

					 w->name, ret);

					 w->name, ret);

		}

		}

		break;

		break;