aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-context.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2006-12-27 21:33:00 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:34:33 -0500
commit62f5fdace7774a45e75e4d651237e7e1e8f05327 (patch)
treec0d95c7d31d7d755c24869d707400ac39ad1cd99 /drivers/media/video/pvrusb2/pvrusb2-context.c
parent1bde02891b3d4d17ee743584bb49ed5f275dff01 (diff)
V4L/DVB (5052): Pvrusb2: Remove stream claiming hack from /dev/radio
Trying to temporarily check that the stream is not claimed during open of the radio device is at best a race condition. What's to stop another app from claiming the stream anyway the instant after the check is done? The implementation for this was dicey anyway. So it's removed. The only "price" for this is that if /dev/radioX is opened while streaming video, then the video stream is just going to switch to radio mode anyway. If a user does this, he gets what he expects... Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-context.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-context.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-context.c b/drivers/media/video/pvrusb2/pvrusb2-context.c
index 69786cdaa859..cf129746205d 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-context.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-context.c
@@ -188,17 +188,6 @@ void pvr2_channel_done(struct pvr2_channel *cp)
188} 188}
189 189
190 190
191int pvr2_channel_check_stream_no_lock(struct pvr2_channel *cp,
192 struct pvr2_context_stream *sp)
193{
194 if (sp == cp->stream) return 0;
195 if (sp->user) {
196 return -EBUSY;
197 }
198 return 0;
199}
200
201
202int pvr2_channel_claim_stream(struct pvr2_channel *cp, 191int pvr2_channel_claim_stream(struct pvr2_channel *cp,
203 struct pvr2_context_stream *sp) 192 struct pvr2_context_stream *sp)
204{ 193{