The patch number 10292 was added via Mauro Carvalho Chehab <mche...@redhat.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Mauro Carvalho Chehab <mche...@redhat.com>
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mche...@redhat.com>
---
.hgignore | 3 ++-
linux/drivers/media/video/em28xx/em28xx-video.c | 7 ++++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff -r 0a855ae09ce1 -r abb4add20e7b .hgignore
--- a/.hgignore Thu Jan 22 20:52:03 2009 -0200
+++ b/.hgignore Thu Jan 22 20:59:21 2009 -0200
@@ -28,6 +28,7 @@ v4l/.myconfig$
v4l/.myconfig$
v4l/.snapshot$
v4l2-apps/lib/.*\.so$
+v4l2-apps/include
v4l2-apps/test/driver-test$
v4l2-apps/test/v4lgrab$
v4l2-apps/test/ioctl-test$
@@ -38,7 +39,7 @@ v4l2-apps/test/pixfmt-test$
v4l2-apps/test/pixfmt-test$
v4l2-apps/util/v4l2-dbg$
v4l2-apps/util/v4l2-chipids.cpp$
-v4l2-apps/util/v4l2-driverids.cpp$
+v4l2-apps/util/v4l2-compliance$
v4l2-apps/util/keycodes/.*
v4l2-apps/util/keytable$
v4l2-apps/util/parse.h$
diff -r 0a855ae09ce1 -r abb4add20e7b
linux/drivers/media/video/em28xx/em28xx-video.c
--- a/linux/drivers/media/video/em28xx/em28xx-video.c Thu Jan 22 20:52:03
2009 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c Thu Jan 22 20:59:21
2009 -0200
@@ -1018,8 +1018,13 @@ static int vidioc_g_ctrl(struct file *fi
if (dev->board.has_msp34xx)
em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
- else
+ else {
rc = em28xx_get_ctrl(dev, ctrl);
+ if (rc < 0) {
+ em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
+ rc = 0;
+ }
+ }
mutex_unlock(&dev->lock);
return rc;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/abb4add20e7b9626a4feb48513751541ed2273b1
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
