Merge remote-tracking branch 'asoc/topic/const' into asoc-next
authorMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:17 +0000 (12:12 +0100)
committerMark Brown <broonie@kernel.org>
Fri, 1 Sep 2017 11:12:17 +0000 (12:12 +0100)
1  2 
sound/soc/codecs/msm8916-wcd-analog.c

index cd4d60ef4c77c390235cb6dff25fa1f188210006,4aa878d29098f5fa09ce08e90e9991f7cd6e6fa9..549c269acc7dfd0a084c333f08076b77390d1c79
@@@ -949,7 -949,7 +949,7 @@@ static irqreturn_t mbhc_btn_release_irq
                u32 val = snd_soc_read(codec, CDC_A_MBHC_RESULT_1);
  
                /* check if its BTN0 thats released */
 -              if ((val >= 0) && !(val & CDC_A_MBHC_RESULT_1_BTN_RESULT_MASK))
 +              if ((val != -1) && !(val & CDC_A_MBHC_RESULT_1_BTN_RESULT_MASK))
                        priv->mbhc_btn0_pressed = false;
  
        } else {
@@@ -998,7 -998,6 +998,6 @@@ static irqreturn_t mbhc_btn_press_irq_h
        return IRQ_HANDLED;
  }
  
  static irqreturn_t pm8916_mbhc_switch_irq_handler(int irq, void *arg)
  {
        struct pm8916_wcd_analog_priv *priv = arg;