aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/meye.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/meye.c')
-rw-r--r--drivers/media/video/meye.c18
1 files changed, 11 insertions, 7 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c
index a1fb9874fdcf..fd16ef0a5868 100644
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@ -1698,13 +1698,7 @@ static const struct file_operations meye_fops = {
1698 .llseek = no_llseek, 1698 .llseek = no_llseek,
1699}; 1699};
1700 1700
1701static struct video_device meye_template = { 1701static const struct v4l2_ioctl_ops meye_ioctl_ops = {
1702 .owner = THIS_MODULE,
1703 .name = "meye",
1704 .type = VID_TYPE_CAPTURE,
1705 .fops = &meye_fops,
1706 .release = video_device_release,
1707 .minor = -1,
1708 .vidioc_querycap = vidioc_querycap, 1702 .vidioc_querycap = vidioc_querycap,
1709 .vidioc_enum_input = vidioc_enum_input, 1703 .vidioc_enum_input = vidioc_enum_input,
1710 .vidioc_g_input = vidioc_g_input, 1704 .vidioc_g_input = vidioc_g_input,
@@ -1725,6 +1719,16 @@ static struct video_device meye_template = {
1725 .vidioc_default = vidioc_default, 1719 .vidioc_default = vidioc_default,
1726}; 1720};
1727 1721
1722static struct video_device meye_template = {
1723 .owner = THIS_MODULE,
1724 .name = "meye",
1725 .type = VID_TYPE_CAPTURE,
1726 .fops = &meye_fops,
1727 .ioctl_ops = &meye_ioctl_ops,
1728 .release = video_device_release,
1729 .minor = -1,
1730};
1731
1728#ifdef CONFIG_PM 1732#ifdef CONFIG_PM
1729static int meye_suspend(struct pci_dev *pdev, pm_message_t state) 1733static int meye_suspend(struct pci_dev *pdev, pm_message_t state)
1730{ 1734{