aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/radio/radio-rtrack2.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 17:03:59 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-13 17:03:59 -0400
commitcf2fa66055d718ae13e62451bb546505f63906a2 (patch)
treee206d3f04e74a34e9aa88d21af6c26eea21d4121 /drivers/media/radio/radio-rtrack2.c
parent4501a466f28788485604ee42641d7a5fe7258d16 (diff)
parent57f51dbc45f65f7ee1e8c8f77200bb8000e3e271 (diff)
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (313 commits) V4L/DVB (9186): Added support for Prof 7300 DVB-S/S2 cards V4L/DVB (9185): S2API: Ensure we have a reasonable ROLLOFF default V4L/DVB (9184): cx24116: Change the default SNR units back to percentage by default. V4L/DVB (9183): S2API: Return error of the caller provides 0 commands. V4L/DVB (9182): S2API: Added support for DTV_HIERARCHY V4L/DVB (9181): S2API: Add support fot DTV_GUARD_INTERVAL and DTV_TRANSMISSION_MODE V4L/DVB (9180): S2API: Added support for DTV_CODE_RATE_HP/LP V4L/DVB (9179): S2API: frontend.h cleanup V4L/DVB (9178): cx24116: Add module parameter to return SNR as ESNO. V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16 V4L/DVB (9176): Add support for DvbWorld USB cards with STV0288 demodulator. V4L/DVB (9175): Remove NULL pointer in stb6000 driver. V4L/DVB (9174): Allow custom inittab for ST STV0288 demodulator. V4L/DVB (9173): S2API: Remove the hardcoded command limit during validation V4L/DVB (9172): S2API: Bugfix related to DVB-S / DVB-S2 tuning for the legacy API. V4L/DVB (9171): S2API: Stop an OOPS if illegal commands are dumped in S2API. V4L/DVB (9170): cx24116: Sanity checking to data input via S2API to the cx24116 demod. V4L/DVB (9169): uvcvideo: Support two new Bison Electronics webcams. V4L/DVB (9168): Add support for MSI TV@nywhere Plus remote V4L/DVB: v4l2-dev: remove duplicated #include ...
Diffstat (limited to 'drivers/media/radio/radio-rtrack2.c')
-rw-r--r--drivers/media/radio/radio-rtrack2.c34
1 files changed, 21 insertions, 13 deletions
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 6d820e2481e7..a67079777419 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -52,6 +52,7 @@ static spinlock_t lock;
52 52
53struct rt_device 53struct rt_device
54{ 54{
55 unsigned long in_use;
55 int port; 56 int port;
56 unsigned long curfreq; 57 unsigned long curfreq;
57 int muted; 58 int muted;
@@ -153,8 +154,7 @@ static int rt_getsigstr(struct rt_device *dev)
153static int vidioc_g_tuner(struct file *file, void *priv, 154static int vidioc_g_tuner(struct file *file, void *priv,
154 struct v4l2_tuner *v) 155 struct v4l2_tuner *v)
155{ 156{
156 struct video_device *dev = video_devdata(file); 157 struct rt_device *rt = video_drvdata(file);
157 struct rt_device *rt = dev->priv;
158 158
159 if (v->index > 0) 159 if (v->index > 0)
160 return -EINVAL; 160 return -EINVAL;
@@ -173,8 +173,7 @@ static int vidioc_g_tuner(struct file *file, void *priv,
173static int vidioc_s_frequency(struct file *file, void *priv, 173static int vidioc_s_frequency(struct file *file, void *priv,
174 struct v4l2_frequency *f) 174 struct v4l2_frequency *f)
175{ 175{
176 struct video_device *dev = video_devdata(file); 176 struct rt_device *rt = video_drvdata(file);
177 struct rt_device *rt = dev->priv;
178 177
179 rt->curfreq = f->frequency; 178 rt->curfreq = f->frequency;
180 rt_setfreq(rt, rt->curfreq); 179 rt_setfreq(rt, rt->curfreq);
@@ -184,8 +183,7 @@ static int vidioc_s_frequency(struct file *file, void *priv,
184static int vidioc_g_frequency(struct file *file, void *priv, 183static int vidioc_g_frequency(struct file *file, void *priv,
185 struct v4l2_frequency *f) 184 struct v4l2_frequency *f)
186{ 185{
187 struct video_device *dev = video_devdata(file); 186 struct rt_device *rt = video_drvdata(file);
188 struct rt_device *rt = dev->priv;
189 187
190 f->type = V4L2_TUNER_RADIO; 188 f->type = V4L2_TUNER_RADIO;
191 f->frequency = rt->curfreq; 189 f->frequency = rt->curfreq;
@@ -210,8 +208,7 @@ static int vidioc_queryctrl(struct file *file, void *priv,
210static int vidioc_g_ctrl(struct file *file, void *priv, 208static int vidioc_g_ctrl(struct file *file, void *priv,
211 struct v4l2_control *ctrl) 209 struct v4l2_control *ctrl)
212{ 210{
213 struct video_device *dev = video_devdata(file); 211 struct rt_device *rt = video_drvdata(file);
214 struct rt_device *rt = dev->priv;
215 212
216 switch (ctrl->id) { 213 switch (ctrl->id) {
217 case V4L2_CID_AUDIO_MUTE: 214 case V4L2_CID_AUDIO_MUTE:
@@ -230,8 +227,7 @@ static int vidioc_g_ctrl(struct file *file, void *priv,
230static int vidioc_s_ctrl(struct file *file, void *priv, 227static int vidioc_s_ctrl(struct file *file, void *priv,
231 struct v4l2_control *ctrl) 228 struct v4l2_control *ctrl)
232{ 229{
233 struct video_device *dev = video_devdata(file); 230 struct rt_device *rt = video_drvdata(file);
234 struct rt_device *rt = dev->priv;
235 231
236 switch (ctrl->id) { 232 switch (ctrl->id) {
237 case V4L2_CID_AUDIO_MUTE: 233 case V4L2_CID_AUDIO_MUTE:
@@ -284,10 +280,21 @@ static int vidioc_s_audio(struct file *file, void *priv,
284 280
285static struct rt_device rtrack2_unit; 281static struct rt_device rtrack2_unit;
286 282
283static int rtrack2_exclusive_open(struct inode *inode, struct file *file)
284{
285 return test_and_set_bit(0, &rtrack2_unit.in_use) ? -EBUSY : 0;
286}
287
288static int rtrack2_exclusive_release(struct inode *inode, struct file *file)
289{
290 clear_bit(0, &rtrack2_unit.in_use);
291 return 0;
292}
293
287static const struct file_operations rtrack2_fops = { 294static const struct file_operations rtrack2_fops = {
288 .owner = THIS_MODULE, 295 .owner = THIS_MODULE,
289 .open = video_exclusive_open, 296 .open = rtrack2_exclusive_open,
290 .release = video_exclusive_release, 297 .release = rtrack2_exclusive_release,
291 .ioctl = video_ioctl2, 298 .ioctl = video_ioctl2,
292#ifdef CONFIG_COMPAT 299#ifdef CONFIG_COMPAT
293 .compat_ioctl = v4l_compat_ioctl32, 300 .compat_ioctl = v4l_compat_ioctl32,
@@ -314,6 +321,7 @@ static struct video_device rtrack2_radio = {
314 .name = "RadioTrack II radio", 321 .name = "RadioTrack II radio",
315 .fops = &rtrack2_fops, 322 .fops = &rtrack2_fops,
316 .ioctl_ops = &rtrack2_ioctl_ops, 323 .ioctl_ops = &rtrack2_ioctl_ops,
324 .release = video_device_release_empty,
317}; 325};
318 326
319static int __init rtrack2_init(void) 327static int __init rtrack2_init(void)
@@ -329,7 +337,7 @@ static int __init rtrack2_init(void)
329 return -EBUSY; 337 return -EBUSY;
330 } 338 }
331 339
332 rtrack2_radio.priv=&rtrack2_unit; 340 video_set_drvdata(&rtrack2_radio, &rtrack2_unit);
333 341
334 spin_lock_init(&lock); 342 spin_lock_init(&lock);
335 if (video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr) < 0) { 343 if (video_register_device(&rtrack2_radio, VFL_TYPE_RADIO, radio_nr) < 0) {