---

yaml --- r: 65727 b: refs/heads/master c: 2cc7209 h: refs/heads/master i: 65725: 773e995 65723: e5c653b 65719: a295ebe 65711: 546f880 65695: ae8b3e0 65663: edc18e1 v: v3
git-mirror · Oct 10, 2007 · b364090 · b364090
1 parent 6d61565
commit b364090
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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;