---

yaml --- r: 76527 b: refs/heads/master c: e1ba33d h: refs/heads/master i: 76525: 0368c56 76523: ccafb18 76519: 832d941 76511: 6d2d451 v: v3
git-mirror · Jan 25, 2008 · 3bce82d · 3bce82d
1 parent df036c7
commit 3bce82d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d2bf930a2f4586a3e19318ed821a34193c4b7cd
+refs/heads/master: e1ba33df0cbc6a7ab339dc093f37825775b9caca
diff --git a/trunk/drivers/media/video/ivtv/ivtv-ioctl.c b/trunk/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -673,11 +673,8 @@ static int ivtv_debug_ioctls(struct file *filp, unsigned int cmd, void *arg)
 		chip->ident = V4L2_IDENT_NONE;
 		chip->revision = 0;
 		if (reg->match_type == V4L2_CHIP_MATCH_HOST) {
-			if (v4l2_chip_match_host(reg->match_type, reg->match_chip)) {
-				struct v4l2_chip_ident *chip = arg;
-
+			if (v4l2_chip_match_host(reg->match_type, reg->match_chip))
 				chip->ident = itv->has_cx23415 ? V4L2_IDENT_CX23415 : V4L2_IDENT_CX23416;
-			}
 			return 0;
 		}
 		if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER)