Merge remote-tracking branch 'char-misc/char-misc-next'

[karo-tx-linux.git] / sound / soc / codecs / arizona.c

diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index 57da0ceda03fa7eb0f4ce384ae040703a7c99f5c..eff4b4d512b7b8fbd8bfa31c3c0ee3a79474a478 100644 (file)
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -840,8 +840,8 @@ int arizona_hp_ev(struct snd_soc_dapm_widget *w,
        priv->arizona->hp_ena &= ~mask;
        priv->arizona->hp_ena |= val;
 
-       /* Force off if HPDET magic is active */
-       if (priv->arizona->hpdet_magic)
+       /* Force off if HPDET clamp is active */
+       if (priv->arizona->hpdet_clamp)
                val = 0;
 
        regmap_update_bits_async(arizona->regmap, ARIZONA_OUTPUT_ENABLES_1,