aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorRichard Knutsson <ricknu-0@student.ltu.se>2007-12-02 12:47:01 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-01-25 16:03:14 -0500
commite1ba33df0cbc6a7ab339dc093f37825775b9caca (patch)
tree261384e47a7634978e827ce66f2104c204adebb2 /drivers/media
parent5d2bf930a2f4586a3e19318ed821a34193c4b7cd (diff)
V4L/DVB (6731): ivtv: Remove a invalid shadow-variable
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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/ivtv/ivtv-ioctl.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/ivtv/ivtv-ioctl.c b/drivers/media/video/ivtv/ivtv-ioctl.c
index 0618fee24952..25b68843a289 100644
--- a/drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/drivers/media/video/ivtv/ivtv-ioctl.c
@@ -673,11 +673,8 @@ static int ivtv_debug_ioctls(struct file *filp, unsigned int cmd, void *arg)
673 chip->ident = V4L2_IDENT_NONE; 673 chip->ident = V4L2_IDENT_NONE;
674 chip->revision = 0; 674 chip->revision = 0;
675 if (reg->match_type == V4L2_CHIP_MATCH_HOST) { 675 if (reg->match_type == V4L2_CHIP_MATCH_HOST) {
676 if (v4l2_chip_match_host(reg->match_type, reg->match_chip)) { 676 if (v4l2_chip_match_host(reg->match_type, reg->match_chip))
677 struct v4l2_chip_ident *chip = arg;
678
679 chip->ident = itv->has_cx23415 ? V4L2_IDENT_CX23415 : V4L2_IDENT_CX23416; 677 chip->ident = itv->has_cx23415 ? V4L2_IDENT_CX23415 : V4L2_IDENT_CX23416;
680 }
681 return 0; 678 return 0;
682 } 679 }
683 if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER) 680 if (reg->match_type == V4L2_CHIP_MATCH_I2C_DRIVER)