summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv/ivtv-ioctl.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2007-08-04 10:06:23 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2007-08-04 10:06:23 +0200
commit67d69df98ea9a3e3190979018295694ced18e204 (patch)
tree45a9edc1e658877094395b09de43cc46e18ef95f /linux/drivers/media/video/ivtv/ivtv-ioctl.c
parentfa8db046b18cc7b04150493f8dafab37a47b2d40 (diff)
downloadmediapointer-dvb-s2-67d69df98ea9a3e3190979018295694ced18e204.tar.gz
mediapointer-dvb-s2-67d69df98ea9a3e3190979018295694ced18e204.tar.bz2
ivtv: make VIDIOC_INT_RESET support smarter.
From: Hans Verkuil <hverkuil@xs4all.nl> Add support to optionally reset the IR and/or the video digitizer. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/ivtv/ivtv-ioctl.c')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-ioctl.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-ioctl.c b/linux/drivers/media/video/ivtv/ivtv-ioctl.c
index 431de8aa2..7d1a5e434 100644
--- a/linux/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/linux/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -687,9 +687,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;