diff options
Diffstat (limited to 'drivers/media/radio/radio-maestro.c')
-rw-r--r-- | drivers/media/radio/radio-maestro.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c index 4bf4d007bcfa..ba3a13a90013 100644 --- a/drivers/media/radio/radio-maestro.c +++ b/drivers/media/radio/radio-maestro.c | |||
@@ -79,12 +79,12 @@ static unsigned long in_use; | |||
79 | 79 | ||
80 | static int maestro_probe(struct pci_dev *pdev, const struct pci_device_id *ent); | 80 | static int maestro_probe(struct pci_dev *pdev, const struct pci_device_id *ent); |
81 | 81 | ||
82 | static int maestro_exclusive_open(struct inode *inode, struct file *file) | 82 | static int maestro_exclusive_open(struct file *file) |
83 | { | 83 | { |
84 | return test_and_set_bit(0, &in_use) ? -EBUSY : 0; | 84 | return test_and_set_bit(0, &in_use) ? -EBUSY : 0; |
85 | } | 85 | } |
86 | 86 | ||
87 | static int maestro_exclusive_release(struct inode *inode, struct file *file) | 87 | static int maestro_exclusive_release(struct file *file) |
88 | { | 88 | { |
89 | clear_bit(0, &in_use); | 89 | clear_bit(0, &in_use); |
90 | return 0; | 90 | return 0; |
@@ -110,15 +110,11 @@ static struct pci_driver maestro_r_driver = { | |||
110 | .remove = __devexit_p(maestro_remove), | 110 | .remove = __devexit_p(maestro_remove), |
111 | }; | 111 | }; |
112 | 112 | ||
113 | static const struct file_operations maestro_fops = { | 113 | static const struct v4l2_file_operations maestro_fops = { |
114 | .owner = THIS_MODULE, | 114 | .owner = THIS_MODULE, |
115 | .open = maestro_exclusive_open, | 115 | .open = maestro_exclusive_open, |
116 | .release = maestro_exclusive_release, | 116 | .release = maestro_exclusive_release, |
117 | .ioctl = video_ioctl2, | 117 | .ioctl = video_ioctl2, |
118 | #ifdef CONFIG_COMPAT | ||
119 | .compat_ioctl = v4l_compat_ioctl32, | ||
120 | #endif | ||
121 | .llseek = no_llseek, | ||
122 | }; | 118 | }; |
123 | 119 | ||
124 | struct radio_device { | 120 | struct radio_device { |