aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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)