]> git.karo-electronics.de Git - mv-sheeva.git/commitdiff
[media] cx231xx: use bitwise negate instead of logical
authorDan Carpenter <error27@gmail.com>
Tue, 28 Dec 2010 00:04:58 +0000 (21:04 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Wed, 29 Dec 2010 10:17:18 +0000 (08:17 -0200)
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>
drivers/media/video/cx231xx/cx231xx-avcore.c

index d52955c21007e2e63b96f916d6cff863ab17292e..c53e97295a0d1d460d5117641e332c1ff109494a 100644 (file)
@@ -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);