aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/compat_ioctl32.c1
-rw-r--r--drivers/media/video/videodev.c12
2 files changed, 13 insertions, 0 deletions
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c
index cefd1381e8de..54de0cd482e9 100644
--- a/drivers/media/video/compat_ioctl32.c
+++ b/drivers/media/video/compat_ioctl32.c
@@ -884,6 +884,7 @@ long v4l_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg)
884 case VIDIOC_G_INPUT32: 884 case VIDIOC_G_INPUT32:
885 case VIDIOC_S_INPUT32: 885 case VIDIOC_S_INPUT32:
886 case VIDIOC_TRY_FMT32: 886 case VIDIOC_TRY_FMT32:
887 case VIDIOC_S_HW_FREQ_SEEK:
887 ret = do_video_ioctl(file, cmd, arg); 888 ret = do_video_ioctl(file, cmd, arg);
888 break; 889 break;
889 890
diff --git a/drivers/media/video/videodev.c b/drivers/media/video/videodev.c
index 7649860a388d..52c56678ee69 100644
--- a/drivers/media/video/videodev.c
+++ b/drivers/media/video/videodev.c
@@ -278,6 +278,7 @@ static const char *v4l2_ioctls[] = {
278 [_IOC_NR(VIDIOC_DBG_G_REGISTER)] = "VIDIOC_DBG_G_REGISTER", 278 [_IOC_NR(VIDIOC_DBG_G_REGISTER)] = "VIDIOC_DBG_G_REGISTER",
279 279
280 [_IOC_NR(VIDIOC_G_CHIP_IDENT)] = "VIDIOC_G_CHIP_IDENT", 280 [_IOC_NR(VIDIOC_G_CHIP_IDENT)] = "VIDIOC_G_CHIP_IDENT",
281 [_IOC_NR(VIDIOC_S_HW_FREQ_SEEK)] = "VIDIOC_S_HW_FREQ_SEEK",
281#endif 282#endif
282}; 283};
283#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls) 284#define V4L2_IOCTLS ARRAY_SIZE(v4l2_ioctls)
@@ -1763,6 +1764,17 @@ static int __video_do_ioctl(struct inode *inode, struct file *file,
1763 ret = vfd->vidioc_default(file, fh, cmd, arg); 1764 ret = vfd->vidioc_default(file, fh, cmd, arg);
1764 break; 1765 break;
1765 } 1766 }
1767 case VIDIOC_S_HW_FREQ_SEEK:
1768 {
1769 struct v4l2_hw_freq_seek *p = arg;
1770 if (!vfd->vidioc_s_hw_freq_seek)
1771 break;
1772 dbgarg(cmd,
1773 "tuner=%d, type=%d, seek_upward=%d, wrap_around=%d\n",
1774 p->tuner, p->type, p->seek_upward, p->wrap_around);
1775 ret = vfd->vidioc_s_hw_freq_seek(file, fh, p);
1776 break;
1777 }
1766 } /* switch */ 1778 } /* switch */
1767 1779
1768 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) { 1780 if (vfd->debug & V4L2_DEBUG_IOCTL_ARG) {