mirror of
https://github.com/torvalds/linux.git
synced 2024-11-04 11:04:38 +00:00
[media] Revert "V4L/DVB: v4l2-dev: remove get_unmapped_area"
This reverts commit c29fcff3da
.
Signed-off-by: Bob Liu <lliubbo@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
parent
4bc90dea7b
commit
ecc6517d94
@ -352,6 +352,23 @@ static long v4l2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
|
||||
return ret;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
#define v4l2_get_unmapped_area NULL
|
||||
#else
|
||||
static unsigned long v4l2_get_unmapped_area(struct file *filp,
|
||||
unsigned long addr, unsigned long len, unsigned long pgoff,
|
||||
unsigned long flags)
|
||||
{
|
||||
struct video_device *vdev = video_devdata(filp);
|
||||
|
||||
if (!vdev->fops->get_unmapped_area)
|
||||
return -ENOSYS;
|
||||
if (!video_is_registered(vdev))
|
||||
return -ENODEV;
|
||||
return vdev->fops->get_unmapped_area(filp, addr, len, pgoff, flags);
|
||||
}
|
||||
#endif
|
||||
|
||||
static int v4l2_mmap(struct file *filp, struct vm_area_struct *vm)
|
||||
{
|
||||
struct video_device *vdev = video_devdata(filp);
|
||||
@ -454,6 +471,7 @@ static const struct file_operations v4l2_fops = {
|
||||
.read = v4l2_read,
|
||||
.write = v4l2_write,
|
||||
.open = v4l2_open,
|
||||
.get_unmapped_area = v4l2_get_unmapped_area,
|
||||
.mmap = v4l2_mmap,
|
||||
.unlocked_ioctl = v4l2_ioctl,
|
||||
#ifdef CONFIG_COMPAT
|
||||
|
@ -62,6 +62,8 @@ struct v4l2_file_operations {
|
||||
unsigned int (*poll) (struct file *, struct poll_table_struct *);
|
||||
long (*ioctl) (struct file *, unsigned int, unsigned long);
|
||||
long (*unlocked_ioctl) (struct file *, unsigned int, unsigned long);
|
||||
unsigned long (*get_unmapped_area) (struct file *, unsigned long,
|
||||
unsigned long, unsigned long, unsigned long);
|
||||
int (*mmap) (struct file *, struct vm_area_struct *);
|
||||
int (*open) (struct file *);
|
||||
int (*release) (struct file *);
|
||||
|
Loading…
Reference in New Issue
Block a user