Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (255 commits)
  [media] radio-aimslab.c: Fix gcc 4.5+ bug
  [media] cx25821: Fix compilation breakage due to BKL dependency
  [media] v4l2-compat-ioctl32: fix compile warning
  [media] zoran: fix compiler warning
  [media] tda18218: fix compile warning
  [media] ngene: fix compile warning
  [media] DVB: IR support for TechnoTrend CT-3650
  [media] cx23885, cimax2.c: Fix case of two CAM insertion irq
  [media] ir-nec-decoder: fix repeat key issue
  [media] staging: se401 depends on USB
  [media] staging: usbvideo/vicam depends on USB
  [media] soc_camera: Add the ability to bind regulators to soc_camedra devices
  [media] V4L2: Add a v4l2-subdev (soc-camera) driver for OmniVision OV2640 sensor
  [media] v4l: soc-camera: switch to .unlocked_ioctl
  [media] v4l: ov772x: simplify pointer dereference
  [media] ov9640: fix OmniVision OV9640 sensor driver's priv data retrieving
  [media] ov9640: use macro to request OmniVision OV9640 sensor private data
  [media] ivtv-i2c: Fix two warnings
  [media] staging/lirc: Update lirc TODO files
  [media] cx88: Remove the obsolete i2c_adapter.id field
  ...

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index cf50fafa8abb..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)
 
         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);
@@ -354,6 +354,7 @@ int cx231xx_afe_update_power_control(struct cx231xx *dev,
         case CX231XX_BOARD_CNXT_VIDEO_GRABBER:
         case CX231XX_BOARD_HAUPPAUGE_EXETER:
         case CX231XX_BOARD_HAUPPAUGE_USBLIVE2:
+        case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
                 if (avmode == POLARIS_AVMODE_ANALOGT_TV) {
                         while (afe_power_status != (FLD_PWRDN_TUNING_BIAS |
                                                 FLD_PWRDN_ENABLE_PLL)) {