The patch number 9931 was added via Mauro Carvalho Chehab <[email protected]>
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:
[email protected]
------
From: Mauro Carvalho Chehab <[email protected]>
em28xx: de-obfuscate vidioc_g_ctrl logic
vidioc_g_ctrl() were using an uneeded confusing logic. Instead, use the
direct approach.
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/video/em28xx/em28xx-video.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff -r e2ca2b35a801 -r 596eba94cf89
linux/drivers/media/video/em28xx/em28xx-video.c
--- a/linux/drivers/media/video/em28xx/em28xx-video.c Mon Dec 22 07:14:31
2008 -0200
+++ b/linux/drivers/media/video/em28xx/em28xx-video.c Mon Dec 22 07:20:32
2008 -0200
@@ -1069,18 +1069,14 @@ static int vidioc_g_ctrl(struct file *fi
rc = check_dev(dev);
if (rc < 0)
return rc;
+ rc = 0;
mutex_lock(&dev->lock);
- if (!dev->board.has_msp34xx)
+ if (dev->board.has_msp34xx)
+ em28xx_i2c_call_clients(dev, VIDIOC_G_CTRL, ctrl);
+ else
rc = em28xx_get_ctrl(dev, ctrl);
- else
- rc = -EINVAL;
-
- if (rc == -EINVAL) {
- 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/596eba94cf89180e0189c5478b13b7f4d4c3adb4
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
