diff options
| author | Andy Walls <awalls@radix.net> | 2008-08-23 15:42:29 -0400 |
|---|---|---|
| committer | Andy Walls <awalls@radix.net> | 2008-08-23 15:42:29 -0400 |
| commit | df6b47b428c6af3a87099d491e8b62904841e682 (patch) | |
| tree | 90fdbb9f18180cf97153d64a0774649634294ed3 /linux/drivers/media/video/cx18/cx18-ioctl.c | |
| parent | 212438136868cf522ade051b9dcfb749643a7c16 (diff) | |
| download | mediapointer-dvb-s2-df6b47b428c6af3a87099d491e8b62904841e682.tar.gz mediapointer-dvb-s2-df6b47b428c6af3a87099d491e8b62904841e682.tar.bz2 | |
cx18: Fix cx18_find_handle() and add error checking
From: Andy Walls <awalls@radix.net>
cx18: Fix cx18_find_handle() and add error checking. cx18_find_handle() did
not find a good task handle and would use the invalid task handle under common
conditions. Added a define for the invalid task handle and added error checking
as well.
Priority: normal
Signed-off-by: Andy Walls <awalls@radix.net>
Diffstat (limited to 'linux/drivers/media/video/cx18/cx18-ioctl.c')
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-ioctl.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-ioctl.c b/linux/drivers/media/video/cx18/cx18-ioctl.c index ec445a173..3f5c2d09a 100644 --- a/linux/drivers/media/video/cx18/cx18-ioctl.c +++ b/linux/drivers/media/video/cx18/cx18-ioctl.c @@ -727,6 +727,7 @@ static int cx18_encoder_cmd(struct file *file, void *fh, { struct cx18_open_id *id = fh; struct cx18 *cx = id->cx; + u32 h; switch (enc->cmd) { case V4L2_ENC_CMD_START: @@ -748,8 +749,14 @@ static int cx18_encoder_cmd(struct file *file, void *fh, return -EPERM; if (test_and_set_bit(CX18_F_I_ENC_PAUSED, &cx->i_flags)) return 0; + h = cx18_find_handle(cx); + if (h == CX18_INVALID_TASK_HANDLE) { + CX18_ERR("Can't find valid task handle for " + "V4L2_ENC_CMD_PAUSE\n"); + return -EBADFD; + } cx18_mute(cx); - cx18_vapi(cx, CX18_CPU_CAPTURE_PAUSE, 1, cx18_find_handle(cx)); + cx18_vapi(cx, CX18_CPU_CAPTURE_PAUSE, 1, h); break; case V4L2_ENC_CMD_RESUME: @@ -759,7 +766,13 @@ static int cx18_encoder_cmd(struct file *file, void *fh, return -EPERM; if (!test_and_clear_bit(CX18_F_I_ENC_PAUSED, &cx->i_flags)) return 0; - cx18_vapi(cx, CX18_CPU_CAPTURE_RESUME, 1, cx18_find_handle(cx)); + h = cx18_find_handle(cx); + if (h == CX18_INVALID_TASK_HANDLE) { + CX18_ERR("Can't find valid task handle for " + "V4L2_ENC_CMD_RESUME\n"); + return -EBADFD; + } + cx18_vapi(cx, CX18_CPU_CAPTURE_RESUME, 1, h); cx18_unmute(cx); break; |