diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2007-08-04 05:06:23 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-09 22:04:51 -0300 |
| commit | 2cc720957a743ef59f9925ecfef5f71f08387d8b (patch) | |
| tree | 0049226ecfbd3de8b6ce56c54ebec2780d98c688 | |
| parent | 89fc4eb924fc8da769083e1680e24c182589d789 (diff) | |
| download | linux-stable-2cc720957a743ef59f9925ecfef5f71f08387d8b.tar.gz linux-stable-2cc720957a743ef59f9925ecfef5f71f08387d8b.tar.bz2 linux-stable-2cc720957a743ef59f9925ecfef5f71f08387d8b.zip | |
V4L/DVB (5994): ivtv: make VIDIOC_INT_RESET support smarter.
Add support to optionally reset the IR and/or the video digitizer.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | drivers/media/video/ivtv/ivtv-ioctl.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c index 85e6a34d5e90..cee6c558c69c 100644 --- a/drivers/media/video/ivtv/ivtv-ioctl.c +++ b/drivers/media/video/ivtv/ivtv-ioctl.c @@ -681,9 +681,17 @@ static int ivtv_debug_ioctls(struct file *filp, unsigned int cmd, void *arg) break; } - case VIDIOC_INT_RESET: - ivtv_reset_ir_gpio(itv); + case VIDIOC_INT_RESET: { + u32 val = *(u32 *)arg; + + if ((val == 0 && itv->options.newi2c) || (val & 0x01)) { + ivtv_reset_ir_gpio(itv); + } + if (val & 0x02) { + itv->video_dec_func(itv, cmd, 0); + } break; + } default: return -EINVAL; |