From b364090fa812701f4b79cd93a8d716efbce17bd7 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Sat, 4 Aug 2007 05:06:23 -0300
Subject: [PATCH] --- yaml --- r: 65727 b: refs/heads/master c:
 2cc720957a743ef59f9925ecfef5f71f08387d8b h: refs/heads/master i:   65725:
 773e995b0afcf57fce0412d296ad99abfc00c6ed   65723:
 e5c653bc17c915215492adc9e22f333cb4c4dc9a   65719:
 a295ebe0df92780cec0f9c97e3db8fa3b64f0361   65711:
 546f880560fc046cbe04f9d09872bc3f651df834   65695:
 ae8b3e0e359c47d836d5ae2425b2c7a765db8d6a   65663:
 edc18e14963f92009585a67c14158cd493a5d842 v: v3

---
 [refs]                                      |  2 +-
 trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a3c6781c7495..16bb8908d0e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 89fc4eb924fc8da769083e1680e24c182589d789
+refs/heads/master: 2cc720957a743ef59f9925ecfef5f71f08387d8b
diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
index 85e6a34d5e90..cee6c558c69c 100644
--- a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/trunk/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;