]> err.no Git - linux-2.6/commitdiff
V4L/DVB (6731): ivtv: Remove a invalid shadow-variable
authorRichard Knutsson <ricknu-0@student.ltu.se>
Sun, 2 Dec 2007 17:47:01 +0000 (14:47 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 25 Jan 2008 21:03:14 +0000 (19:03 -0200)
Remove the shadowing 'struct v4l2_chip_ident *chip', since it already exists
and makes the if-statement useless.

Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/ivtv/ivtv-ioctl.c

index 0618fee24952aaa65c439f92a1c62f36b7d3a72d..25b68843a28940960f57e1034f0cea4ac46c30eb 100644 (file)
@@ -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)