From a21956bbd4a92f0d9a2c02ce202670ed76a79ec3 Mon Sep 17 00:00:00 2001 From: Devin Heitmueller Date: Mon, 6 Aug 2012 22:46:54 -0300 Subject: [PATCH] --- yaml --- r: 330711 b: refs/heads/master c: 364d2db2791aa3a808d2590ef62c53b4a83c25dd h: refs/heads/master i: 330709: 8ff998288252cbdeddc82b35490b410cf67f0e4e 330707: 7692882dfa3d3c9cb317f2ef74ebc0a561aa7b27 330703: 6bd7b40f3f03ea5ddea66e34f621e7963a237048 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/au0828/au0828-video.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index f8edc28b3136..b1a4d37fd1a9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 43f2cccfc81c0af719a425ea816ce8003bb09748 +refs/heads/master: 364d2db2791aa3a808d2590ef62c53b4a83c25dd diff --git a/trunk/drivers/media/video/au0828/au0828-video.c b/trunk/drivers/media/video/au0828/au0828-video.c index ac3dd733ab81..6e30c094c56f 100644 --- a/trunk/drivers/media/video/au0828/au0828-video.c +++ b/trunk/drivers/media/video/au0828/au0828-video.c @@ -1717,8 +1717,12 @@ static int vidioc_g_register(struct file *file, void *priv, v4l2_device_call_all(&dev->v4l2_dev, 0, core, g_register, reg); return 0; default: - return -EINVAL; + if (!v4l2_chip_match_host(®->match)) + return -EINVAL; } + + reg->val = au0828_read(dev, reg->reg); + return 0; } static int vidioc_s_register(struct file *file, void *priv, @@ -1732,9 +1736,10 @@ static int vidioc_s_register(struct file *file, void *priv, v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_register, reg); return 0; default: - return -EINVAL; + if (!v4l2_chip_match_host(®->match)) + return -EINVAL; } - return 0; + return au0828_writereg(dev, reg->reg, reg->val); } #endif