From 3bce82d2cda66ff32472a56436903a5da8945ee0 Mon Sep 17 00:00:00 2001 From: Richard Knutsson Date: Sun, 2 Dec 2007 14:47:01 -0300 Subject: [PATCH] --- yaml --- r: 76527 b: refs/heads/master c: e1ba33df0cbc6a7ab339dc093f37825775b9caca h: refs/heads/master i: 76525: 0368c560b99a1ae478f5f626aa8f67d5cbf87f8a 76523: ccafb189b1788bb11a347cb65cbc4d235d32aa2b 76519: 832d9410e53b26d8af3ff1b27e4f24fe3d1cc279 76511: 6d2d451ec625d47b18344eb3f0e4171b528e5869 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/ivtv/ivtv-ioctl.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 3a5ecff731dd..652796db2b4c 100644 --- 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 index 0618fee24952..25b68843a289 100644 --- 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)