From a58e66d387c130d3adede0976c1d7196dd2c937a Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Mon, 27 Dec 2010 21:04:58 -0300 Subject: [PATCH] --- yaml --- r: 226375 b: refs/heads/master c: 5f63306d82131371f464c0e5b7ebe6a23a84c768 h: refs/heads/master i: 226373: ff89ad6f96ab2cbaa37eb64d6b0ee716f7688b39 226371: 41a05b245398c8c4276f04caacd3a7e6dee5b69a 226367: 6bb6b77debfa82ce8bcace6f572244e3762fe93a v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cx231xx/cx231xx-avcore.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 4e7761296e9d..69c2d5325ef1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3fa904ec79b94f0db7faed010ff94d42f7d1d47 +refs/heads/master: 5f63306d82131371f464c0e5b7ebe6a23a84c768 diff --git a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c b/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c index d52955c21007..c53e97295a0d 100644 --- a/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c +++ b/trunk/drivers/media/video/cx231xx/cx231xx-avcore.c @@ -274,7 +274,7 @@ int cx231xx_afe_set_input_mux(struct cx231xx *dev, u32 input_mux) if (ch1_setting != 0) { status = afe_read_byte(dev, ADC_INPUT_CH1, &value); - value &= (!INPUT_SEL_MASK); + value &= ~INPUT_SEL_MASK; value |= (ch1_setting - 1) << 4; value &= 0xff; status = afe_write_byte(dev, ADC_INPUT_CH1, value); @@ -282,7 +282,7 @@ int cx231xx_afe_set_input_mux(struct cx231xx *dev, u32 input_mux) if (ch2_setting != 0) { status = afe_read_byte(dev, ADC_INPUT_CH2, &value); - value &= (!INPUT_SEL_MASK); + value &= ~INPUT_SEL_MASK; value |= (ch2_setting - 1) << 4; value &= 0xff; status = afe_write_byte(dev, ADC_INPUT_CH2, value); @@ -292,7 +292,7 @@ int cx231xx_afe_set_input_mux(struct cx231xx *dev, u32 input_mux) 7 less than the input number */ if (ch3_setting != 0) { status = afe_read_byte(dev, ADC_INPUT_CH3, &value); - value &= (!INPUT_SEL_MASK); + value &= ~INPUT_SEL_MASK; value |= (ch3_setting - 1) << 4; value &= 0xff; status = afe_write_byte(dev, ADC_INPUT_CH3, value);