diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-02 18:36:12 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-04-02 18:36:12 +0200 |
| commit | 9b54bc1a265d4349a6ded6fdefd7bd70b3a48b81 (patch) | |
| tree | 9461c241cf4899056f6ad8b123c5fffbeaf72540 /linux/drivers/media | |
| parent | cb228051a31b5d0f78a3b3e7e8a960d1658afcf5 (diff) | |
| parent | 6c14e144cdc5613c2d56f1a991b87366184c634c (diff) | |
| download | mediapointer-dvb-s2-9b54bc1a265d4349a6ded6fdefd7bd70b3a48b81.tar.gz mediapointer-dvb-s2-9b54bc1a265d4349a6ded6fdefd7bd70b3a48b81.tar.bz2 | |
merge: from master
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/cpia2/cpia2.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/videodev.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.c b/linux/drivers/media/dvb/dvb-core/dvbdev.c index 123ea8344..85d6a6c65 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.c +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.c @@ -93,7 +93,7 @@ static int dvb_device_open(struct inode *inode, struct file *file) if (dvbdev && dvbdev->fops) { int err = 0; - struct file_operations *old_fops; + const struct file_operations *old_fops; file->private_data = dvbdev; old_fops = file->f_op; diff --git a/linux/drivers/media/video/cpia2/cpia2.h b/linux/drivers/media/video/cpia2/cpia2.h index a53056c82..7480c1827 100644 --- a/linux/drivers/media/video/cpia2/cpia2.h +++ b/linux/drivers/media/video/cpia2/cpia2.h @@ -462,7 +462,7 @@ int cpia2_init_camera(struct camera_data *cam); int cpia2_allocate_buffers(struct camera_data *cam); void cpia2_free_buffers(struct camera_data *cam); long cpia2_read(struct camera_data *cam, - char *buf, unsigned long count, int noblock); + char __user *buf, unsigned long count, int noblock); unsigned int cpia2_poll(struct camera_data *cam, struct file *filp, poll_table *wait); int cpia2_remap_buffer(struct camera_data *cam, struct vm_area_struct *vma); diff --git a/linux/drivers/media/video/videodev.c b/linux/drivers/media/video/videodev.c index 8747de34a..e54b8d9f7 100644 --- a/linux/drivers/media/video/videodev.c +++ b/linux/drivers/media/video/videodev.c @@ -111,7 +111,7 @@ static int video_open(struct inode *inode, struct file *file) unsigned int minor = iminor(inode); int err = 0; struct video_device *vfl; - struct file_operations *old_fops; + const struct file_operations *old_fops; if(minor>=VIDEO_NUM_DEVICES) return -ENODEV; |