Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=2cc720957a743ef59f9925ecfef5f71f08387d8b
Commit:     2cc720957a743ef59f9925ecfef5f71f08387d8b
Parent:     89fc4eb924fc8da769083e1680e24c182589d789
Author:     Hans Verkuil <[EMAIL PROTECTED]>
AuthorDate: Sat Aug 4 05:06:23 2007 -0300
Committer:  Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Tue Oct 9 22:04:51 2007 -0300

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
 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 85e6a34..cee6c55 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to