diff options
Diffstat (limited to 'drivers/media/video/omap24xxcam.c')
-rw-r--r-- | drivers/media/video/omap24xxcam.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/media/video/omap24xxcam.c b/drivers/media/video/omap24xxcam.c index 85c3c7c92af1..73eb656acfe3 100644 --- a/drivers/media/video/omap24xxcam.c +++ b/drivers/media/video/omap24xxcam.c | |||
@@ -1454,9 +1454,9 @@ static int omap24xxcam_mmap(struct file *file, struct vm_area_struct *vma) | |||
1454 | return rval; | 1454 | return rval; |
1455 | } | 1455 | } |
1456 | 1456 | ||
1457 | static int omap24xxcam_open(struct inode *inode, struct file *file) | 1457 | static int omap24xxcam_open(struct file *file) |
1458 | { | 1458 | { |
1459 | int minor = iminor(inode); | 1459 | int minor = video_devdata(file)->minor; |
1460 | struct omap24xxcam_device *cam = omap24xxcam.priv; | 1460 | struct omap24xxcam_device *cam = omap24xxcam.priv; |
1461 | struct omap24xxcam_fh *fh; | 1461 | struct omap24xxcam_fh *fh; |
1462 | struct v4l2_format format; | 1462 | struct v4l2_format format; |
@@ -1511,7 +1511,7 @@ out_try_module_get: | |||
1511 | return -ENODEV; | 1511 | return -ENODEV; |
1512 | } | 1512 | } |
1513 | 1513 | ||
1514 | static int omap24xxcam_release(struct inode *inode, struct file *file) | 1514 | static int omap24xxcam_release(struct file *file) |
1515 | { | 1515 | { |
1516 | struct omap24xxcam_fh *fh = file->private_data; | 1516 | struct omap24xxcam_fh *fh = file->private_data; |
1517 | struct omap24xxcam_device *cam = fh->cam; | 1517 | struct omap24xxcam_device *cam = fh->cam; |
@@ -1559,8 +1559,7 @@ static int omap24xxcam_release(struct inode *inode, struct file *file) | |||
1559 | return 0; | 1559 | return 0; |
1560 | } | 1560 | } |
1561 | 1561 | ||
1562 | static struct file_operations omap24xxcam_fops = { | 1562 | static struct v4l2_file_operations omap24xxcam_fops = { |
1563 | .llseek = no_llseek, | ||
1564 | .ioctl = video_ioctl2, | 1563 | .ioctl = video_ioctl2, |
1565 | .poll = omap24xxcam_poll, | 1564 | .poll = omap24xxcam_poll, |
1566 | .mmap = omap24xxcam_mmap, | 1565 | .mmap = omap24xxcam_mmap, |