4 files changed, 7 insertions, 4 deletions

diff --git a/drivers/media/video/cx88/Kconfig b/drivers/media/video/cx88/Kconfig
index 80e23ee9801c..7a94e6a11927 100644
--- a/drivers/media/video/cx88/Kconfig
+++ b/drivers/media/video/cx88/Kconfig
@@ -51,6 +51,7 @@ config VIDEO_CX88_DVB
         tristate "DVB/ATSC Support for cx2388x based TV cards"
         depends on VIDEO_CX88 && DVB_CORE
         select VIDEO_BUF_DVB
+        select DVB_PLL
         ---help---
           This adds support for DVB/ATSC cards based on the
           Conexant 2388x chip.
diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 349632b48e93..b60177f173c3 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -453,11 +453,13 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
         if (firmware->size != BLACKBIRD_FIRM_IMAGE_SIZE) {
                 dprintk(0, "ERROR: Firmware size mismatch (have %zd, expected %d)\n",
                         firmware->size, BLACKBIRD_FIRM_IMAGE_SIZE);
+                release_firmware(firmware);
                 return -1;
         }
 
         if (0 != memcmp(firmware->data, magic, 8)) {
                 dprintk(0, "ERROR: Firmware magic mismatch, wrong file?\n");
+                release_firmware(firmware);
                 return -1;
         }
 
@@ -478,6 +480,7 @@ static int blackbird_load_firmware(struct cx8802_dev *dev)
         }
         if (checksum) {
                 dprintk(0, "ERROR: Firmware load failed (checksum mismatch).\n");
+                release_firmware(firmware);
                 return -1;
         }
         release_firmware(firmware);
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index 72b630a91f41..c25564648993 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -89,7 +89,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
                 auxgpio = cx_read(MO_GP1_IO);
                 /* Take out the parity part */
-                gpio+=(gpio & 0x7fd) + (auxgpio & 0xef);
+                gpio=(gpio & 0x7fd) + (auxgpio & 0xef);
         } else
                 auxgpio = gpio;
 
diff --git a/drivers/media/video/cx88/cx88-video.c b/drivers/media/video/cx88/cx88-video.c
index 2225d4b94140..94c92bacc342 100644
--- a/drivers/media/video/cx88/cx88-video.c
+++ b/drivers/media/video/cx88/cx88-video.c
@@ -1180,7 +1180,6 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                         V4L2_CAP_READWRITE     |
                         V4L2_CAP_STREAMING     |
                         V4L2_CAP_VBI_CAPTURE   |
-                        V4L2_CAP_VIDEO_OVERLAY |
                         0;
                 if (UNSET != core->tuner_type)
                         cap->capabilities |= V4L2_CAP_TUNER;
@@ -1226,7 +1225,7 @@ static int video_do_ioctl(struct inode *inode, struct file *file,
                 struct v4l2_format *f = arg;
                 return cx8800_try_fmt(dev,fh,f);
         }
-#ifdef HAVE_V4L1
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
         /* --- streaming capture ------------------------------------- */
         case VIDIOCGMBUF:
         {
@@ -1585,7 +1584,7 @@ static int radio_do_ioctl(struct inode *inode, struct file *file,
                 *id = 0;
                 return 0;
         }
-#ifdef HAVE_V4L1
+#ifdef CONFIG_VIDEO_V4L1_COMPAT
         case VIDIOCSTUNER:
         {
                 struct video_tuner *v = arg;