aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-12-27 19:04:58 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-12-29 05:17:18 -0500
commit5f63306d82131371f464c0e5b7ebe6a23a84c768 (patch)
tree39c1219a62cfc3fb9931060cd39669240fad17ee
parenta3fa904ec79b94f0db7faed010ff94d42f7d1d47 (diff)
[media] cx231xx: use bitwise negate instead of logical
Bitwise negate was intended here. INPUT_SEL_MASK is 0x30. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx231xx/cx231xx-avcore.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index d52955c21007..c53e97295a0d 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -274,7 +274,7 @@ int cx231xx_afe_set_input_mux(struct cx231xx *dev, u32 input_mux)
274 274
275 if (ch1_setting != 0) { 275 if (ch1_setting != 0) {
276 status = afe_read_byte(dev, ADC_INPUT_CH1, &value); 276 status = afe_read_byte(dev, ADC_INPUT_CH1, &value);
277 value &= (!INPUT_SEL_MASK); 277 value &= ~INPUT_SEL_MASK;
278 value |= (ch1_setting - 1) << 4; 278 value |= (ch1_setting - 1) << 4;
279 value &= 0xff; 279 value &= 0xff;
280 status = afe_write_byte(dev, ADC_INPUT_CH1, value); 280 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)
282 282
283 if (ch2_setting != 0) { 283 if (ch2_setting != 0) {
284 status = afe_read_byte(dev, ADC_INPUT_CH2, &value); 284 status = afe_read_byte(dev, ADC_INPUT_CH2, &value);
285 value &= (!INPUT_SEL_MASK); 285 value &= ~INPUT_SEL_MASK;
286 value |= (ch2_setting - 1) << 4; 286 value |= (ch2_setting - 1) << 4;
287 value &= 0xff; 287 value &= 0xff;
288 status = afe_write_byte(dev, ADC_INPUT_CH2, value); 288 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)
292 7 less than the input number */ 292 7 less than the input number */
293 if (ch3_setting != 0) { 293 if (ch3_setting != 0) {
294 status = afe_read_byte(dev, ADC_INPUT_CH3, &value); 294 status = afe_read_byte(dev, ADC_INPUT_CH3, &value);
295 value &= (!INPUT_SEL_MASK); 295 value &= ~INPUT_SEL_MASK;
296 value |= (ch3_setting - 1) << 4; 296 value |= (ch3_setting - 1) << 4;
297 value &= 0xff; 297 value &= 0xff;
298 status = afe_write_byte(dev, ADC_INPUT_CH3, value); 298 status = afe_write_byte(dev, ADC_INPUT_CH3, value);