From 70092a776f7f364cf5ac49da7214bf0aa5a7da46 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Sun, 9 Aug 2009 19:39:23 -0300 Subject: [PATCH] --- yaml --- r: 161507 b: refs/heads/master c: 4efa2d75d4a3b86c2d47c422237c848d1f04ba58 h: refs/heads/master i: 161505: 0b1dbb16bce7ed8806aff6876ed20386d526350b 161503: b7a51db48cab467b6af5635b4b927baa0b75488d v: v3 --- [refs] | 2 +- trunk/drivers/media/video/em28xx/em28xx-video.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index cd8470224d19..d836c4f19958 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c53d83ccc8a180d05f6f930167a4acd4a9694e5d +refs/heads/master: 4efa2d75d4a3b86c2d47c422237c848d1f04ba58 diff --git a/trunk/drivers/media/video/em28xx/em28xx-video.c b/trunk/drivers/media/video/em28xx/em28xx-video.c index f3ee001f21ca..a6bdbc21410e 100644 --- a/trunk/drivers/media/video/em28xx/em28xx-video.c +++ b/trunk/drivers/media/video/em28xx/em28xx-video.c @@ -1314,8 +1314,9 @@ static int vidioc_g_register(struct file *file, void *priv, v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg); return 0; case V4L2_CHIP_MATCH_I2C_ADDR: - /* Not supported yet */ - return -EINVAL; + /* TODO: is this correct? */ + v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg); + return 0; default: if (!v4l2_chip_match_host(®->match)) return -EINVAL; @@ -1366,8 +1367,9 @@ static int vidioc_s_register(struct file *file, void *priv, v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg); return 0; case V4L2_CHIP_MATCH_I2C_ADDR: - /* Not supported yet */ - return -EINVAL; + /* TODO: is this correct? */ + v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg); + return 0; default: if (!v4l2_chip_match_host(®->match)) return -EINVAL;