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>

diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 85e6a34d5e90a0f820b670f9ef7ece7354913648..cee6c558c69c6f3bdc6f4075fbf1da1ecccb6fa4 100644 (file)
--- 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;