summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/video')
-rw-r--r--linux/drivers/media/video/cx88/cx88-tvaudio.c4
-rw-r--r--linux/drivers/media/video/cx88/cx88-vbi.c1
-rw-r--r--linux/drivers/media/video/cx88/cx88-video.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-tvaudio.c b/linux/drivers/media/video/cx88/cx88-tvaudio.c
index 1c98b741a..7a57c20d1 100644
--- a/linux/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/linux/drivers/media/video/cx88/cx88-tvaudio.c
@@ -51,7 +51,7 @@
#include "cx88.h"
-static unsigned int audio_debug = UNSET;
+static unsigned int audio_debug = 1;
MODULE_PARM(audio_debug,"i");
MODULE_PARM_DESC(audio_debug,"enable debug messages [audio]");
@@ -118,6 +118,8 @@ static void set_audio_standard_BTSC(struct cx8800_dev *dev, unsigned int sap)
{ AUD_DBX_SE_GAIN, 0x8D31 },
{ AUD_DEEMPH0_G0, 0x1604 },
{ AUD_PHASE_FIX_CTL, 0x0020 },
+
+ { /* end of list */ },
};
dprintk("%s (status: unknown)\n",__FUNCTION__);
diff --git a/linux/drivers/media/video/cx88/cx88-vbi.c b/linux/drivers/media/video/cx88/cx88-vbi.c
index f6806b828..b1221fa7f 100644
--- a/linux/drivers/media/video/cx88/cx88-vbi.c
+++ b/linux/drivers/media/video/cx88/cx88-vbi.c
@@ -1,5 +1,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
+#include <linux/init.h>
#include <linux/slab.h>
#include "cx88.h"
diff --git a/linux/drivers/media/video/cx88/cx88-video.c b/linux/drivers/media/video/cx88/cx88-video.c
index 838affd8c..057d9253e 100644
--- a/linux/drivers/media/video/cx88/cx88-video.c
+++ b/linux/drivers/media/video/cx88/cx88-video.c
@@ -1390,7 +1390,7 @@ static int set_control(struct cx8800_dev *dev, struct v4l2_control *ctl)
return 0;
}
-static int init_controls(struct cx8800_dev *dev)
+static void init_controls(struct cx8800_dev *dev)
{
static struct v4l2_control mute = {
.id = V4L2_CID_AUDIO_MUTE,