diff options
| author | Jie Yang <yang.jie@intel.com> | 2015-02-26 23:52:26 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-06 15:17:10 -0500 |
| commit | 5af76d5c0882435241841186b054262407e9eabb (patch) | |
| tree | 122ff15cd3803260b3996b82ffda7658794337b7 /sound | |
| parent | e2cef68d5903cc2052e9f6e46b323b7ead695e73 (diff) | |
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')
| -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) | |||
| 397 | 397 | ||
| 398 | if (jack) { | 398 | if (jack) { |
| 399 | /* enable IRQ */ | 399 | /* enable IRQ */ |
| 400 | if (rt286->jack->status | SND_JACK_HEADPHONE) | 400 | if (rt286->jack->status & SND_JACK_HEADPHONE) |
| 401 | snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO1"); | 401 | snd_soc_dapm_force_enable_pin(&codec->dapm, "LDO1"); |
| 402 | regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2); | 402 | regmap_update_bits(rt286->regmap, RT286_IRQ_CTRL, 0x2, 0x2); |
| 403 | /* Send an initial empty report */ | 403 | /* Send an initial empty report */ |