summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <devnull@localhost>2005-12-07 11:51:18 +0000
committerMauro Carvalho Chehab <devnull@localhost>2005-12-07 11:51:18 +0000
commit54d62ea7926b3102e2fbc1daae5a3075e95f59e9 (patch)
treeb1302196cf2eda1fb1ee6e332d1be7b0378be5dc
parent612cbef536b856016be222ee2da010e9a34c433b (diff)
downloadmediapointer-dvb-s2-54d62ea7926b3102e2fbc1daae5a3075e95f59e9.tar.gz
mediapointer-dvb-s2-54d62ea7926b3102e2fbc1daae5a3075e95f59e9.tar.bz2
kernel-sync patches.
kernel-sync Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
-rw-r--r--linux/drivers/media/video/compat_ioctl32.c10
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-audio.c1
-rw-r--r--linux/drivers/media/video/cx25840/cx25840-core.c1
-rw-r--r--linux/drivers/media/video/cx88/Kconfig4
-rw-r--r--linux/drivers/media/video/cx88/cx88.h4
-rw-r--r--linux/drivers/media/video/rds.h2
-rw-r--r--linux/drivers/media/video/saa6588.c4
-rw-r--r--linux/drivers/media/video/saa7115.c1
-rw-r--r--linux/drivers/media/video/saa7127.c1
-rw-r--r--v4l/ChangeLog18
10 files changed, 30 insertions, 16 deletions
diff --git a/linux/drivers/media/video/compat_ioctl32.c b/linux/drivers/media/video/compat_ioctl32.c
index 45bcf3890..c1ea146d2 100644
--- a/linux/drivers/media/video/compat_ioctl32.c
+++ b/linux/drivers/media/video/compat_ioctl32.c
@@ -107,11 +107,11 @@ static int native_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
{
int ret = -ENOIOCTLCMD;
- if (file->f_op->unlocked_ioctl)
- ret = file->f_op->unlocked_ioctl(file, cmd, arg);
- else if (file->f_op->ioctl) {
+ if (file->f_ops->unlocked_ioctl)
+ ret = file->f_ops->unlocked_ioctl(file, cmd, arg);
+ else if (file->f_ops->ioctl) {
lock_kernel();
- ret = file->f_op->ioctl(file->f_dentry->d_inode, file, cmd, arg);
+ ret = file->f_ops->ioctl(file->f_dentry->d_inode, file, cmd, arg);
unlock_kernel();
}
@@ -628,7 +628,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
{
int ret = -ENOIOCTLCMD;
- if (!file->f_op->ioctl)
+ if (!file->f_ops->ioctl)
return ret;
switch (cmd) {
diff --git a/linux/drivers/media/video/cx25840/cx25840-audio.c b/linux/drivers/media/video/cx25840/cx25840-audio.c
index da410e5b1..448305874 100644
--- a/linux/drivers/media/video/cx25840/cx25840-audio.c
+++ b/linux/drivers/media/video/cx25840/cx25840-audio.c
@@ -20,7 +20,6 @@
#include <linux/videodev2.h>
#include <linux/i2c.h>
#include <media/audiochip.h>
-#include <media/i2c-compat.h>
#include <media/v4l2-common.h>
#include "cx25840.h"
diff --git a/linux/drivers/media/video/cx25840/cx25840-core.c b/linux/drivers/media/video/cx25840/cx25840-core.c
index d70f0dcb6..517a702bd 100644
--- a/linux/drivers/media/video/cx25840/cx25840-core.c
+++ b/linux/drivers/media/video/cx25840/cx25840-core.c
@@ -33,7 +33,6 @@
#include <linux/videodev2.h>
#include <linux/i2c.h>
#include <media/audiochip.h>
-#include <media/i2c-compat.h>
#include <media/v4l2-common.h>
#include "cx25840.h"
diff --git a/linux/drivers/media/video/cx88/Kconfig b/linux/drivers/media/video/cx88/Kconfig
index ec6201a32..e2276a20e 100644
--- a/linux/drivers/media/video/cx88/Kconfig
+++ b/linux/drivers/media/video/cx88/Kconfig
@@ -92,8 +92,8 @@ config VIDEO_CX88_DVB_NXT200X
Connexant 2388x chip and the NXT2002/NXT2004 demodulator.
config VIDEO_CX88_DVB_CX24123
- bool "Conexant CX24123 DVB-S Support"
- default y
+ tristate "Conexant CX24123 DVB-S Support"
+ default m
depends on VIDEO_CX88_DVB && !VIDEO_CX88_DVB_ALL_FRONTENDS
select DVB_CX24123
---help---
diff --git a/linux/drivers/media/video/cx88/cx88.h b/linux/drivers/media/video/cx88/cx88.h
index 89a7fd2a6..6d801f6dd 100644
--- a/linux/drivers/media/video/cx88/cx88.h
+++ b/linux/drivers/media/video/cx88/cx88.h
@@ -1,5 +1,5 @@
/*
- * $Id: cx88.h,v 1.93 2005/12/05 02:31:46 mchehab Exp $
+ * $Id: cx88.h,v 1.94 2005/12/07 11:51:19 mchehab Exp $
*
* v4l2 device driver for cx2388x based TV cards
*
@@ -38,7 +38,7 @@
#include "btcx-risc.h"
#include "cx88-reg.h"
-#include <linux/utsname.h>
+#include <linux/version.h>
#define CX88_VERSION_CODE KERNEL_VERSION(0,0,5)
#ifndef TRUE
diff --git a/linux/drivers/media/video/rds.h b/linux/drivers/media/video/rds.h
index 30337d0f1..0d30eb744 100644
--- a/linux/drivers/media/video/rds.h
+++ b/linux/drivers/media/video/rds.h
@@ -31,7 +31,7 @@
struct rds_command {
unsigned int block_count;
int result;
- unsigned char *buffer;
+ unsigned char __user *buffer;
struct file *instance;
poll_table *event_list;
};
diff --git a/linux/drivers/media/video/saa6588.c b/linux/drivers/media/video/saa6588.c
index 695c69d42..8ed0e96d4 100644
--- a/linux/drivers/media/video/saa6588.c
+++ b/linux/drivers/media/video/saa6588.c
@@ -163,7 +163,7 @@ static struct i2c_client client_template;
/* ---------------------------------------------------------------------- */
-static int block_to_user_buf(struct saa6588 *s, unsigned char *user_buf)
+static int block_to_user_buf(struct saa6588 *s, unsigned char __user *user_buf)
{
int i;
@@ -197,7 +197,7 @@ static void read_from_buf(struct saa6588 *s, struct rds_command *a)
{
unsigned long flags;
- unsigned char *buf_ptr = a->buffer; /* This is a user space buffer! */
+ unsigned char __user *buf_ptr = a->buffer;
unsigned int i;
unsigned int rd_blocks;
diff --git a/linux/drivers/media/video/saa7115.c b/linux/drivers/media/video/saa7115.c
index cd65bf92b..434e33def 100644
--- a/linux/drivers/media/video/saa7115.c
+++ b/linux/drivers/media/video/saa7115.c
@@ -39,7 +39,6 @@
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
-#include <media/i2c-compat.h>
#include <media/v4l2-common.h>
MODULE_DESCRIPTION("Philips SAA7114/SAA7115 video decoder driver");
diff --git a/linux/drivers/media/video/saa7127.c b/linux/drivers/media/video/saa7127.c
index 8f2192ae2..0dcc4948b 100644
--- a/linux/drivers/media/video/saa7127.c
+++ b/linux/drivers/media/video/saa7127.c
@@ -54,7 +54,6 @@
#include <linux/slab.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
-#include <media/i2c-compat.h>
#include <media/v4l2-common.h>
static int debug = 0;
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 0527c2fab..924c1964e 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,21 @@
+2005-12-07 11:49 mchehab
+
+ * linux/drivers/media/video/compat_ioctl32.c: (native_ioctl),
+ (v4l_compat_ioctl32):
+ * linux/drivers/media/video/cx25840/cx25840-audio.c:
+ * linux/drivers/media/video/cx25840/cx25840-core.c:
+ * linux/drivers/media/video/cx88/Kconfig:
+ * linux/drivers/media/video/cx88/cx88.h:
+ * linux/drivers/media/video/rds.h:
+ * linux/drivers/media/video/saa6588.c: (block_to_user_buf),
+ (read_from_buf):
+ * linux/drivers/media/video/saa7115.c:
+ * linux/drivers/media/video/saa7127.c:
+
+ kernel-sync patches.
+
+ Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
+
2005-12-07 11:15 mchehab
* linux/drivers/media/video/bttv-driver.c: (set_pll),