| commit | 43d11bc49b529a02024df0a7355b5832e97f5a0d | [log] [tgz] |
|---|---|---|
| author | Linux Build Service Account <lnxbuild@localhost> | Mon Dec 02 09:47:00 2013 -0800 |
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Dec 02 09:47:00 2013 -0800 |
| tree | 5e71500b954686e8b147c2247287fa112d3d42f4 | |
| parent | 5be08dea4f67eb48906f184a706ac8038b21ae90 [diff] | |
| parent | cff6b348c826ff31b38044802c647371d0039209 [diff] |
Merge "ASoC: wcd9xxx: correct hph_status handling"
diff --git a/sound/soc/codecs/wcd9xxx-mbhc.c b/sound/soc/codecs/wcd9xxx-mbhc.c index ba9add2..6771aae 100644 --- a/sound/soc/codecs/wcd9xxx-mbhc.c +++ b/sound/soc/codecs/wcd9xxx-mbhc.c
@@ -841,7 +841,8 @@ mbhc->zl = mbhc->zr = 0; wcd9xxx_jack_report(mbhc, &mbhc->headset_jack, 0, WCD9XXX_JACK_MASK); - mbhc->hph_status = 0; + mbhc->hph_status &= ~(SND_JACK_HEADSET | + SND_JACK_LINEOUT); } /* Report insertion */ mbhc->hph_status |= jack_type;