diff options
| author | Jie Yang <yang.jie@intel.com> | 2015-02-27 05:52:26 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-06 21:17:10 +0100 |
| commit | 5af76d5c0882435241841186b054262407e9eabb (patch) | |
| tree | 122ff15cd3803260b3996b82ffda7658794337b7 /sound/soc | |
| parent | ASoC: rt286: add jack detection disable with NULL jack passed (diff) | |
| download | linux-5af76d5c0882435241841186b054262407e9eabb.tar.xz linux-5af76d5c0882435241841186b054262407e9eabb.zip | |
ASoC: rt286: correct the OR to AND
Here it should be AND(&) to check the status.
Signed-off-by: Jie Yang <yang.jie@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/rt286.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/rt286.c b/sound/soc/codecs/rt286.c index 16723b167fbf..49c44a77b518 100644 --- a/sound/soc/codecs/rt286.c +++ b/sound/soc/codecs/rt286.c @@ -397,7 +397,7 @@ int rt286_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack) if (jack) { /* enable IRQ */ - if (rt286->jack->status | SND_JACK_HEADPHONE) + if (rt286->jack->status & SND_JACK_HEADPHONE) snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO1"); regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2); /* Send an initial empty report */ |