summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-01-08uvcvideo: replace strn{cpy,cat} with strl{cpy,cat}.Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> strncpy is unsafe as it doesn't append a terminating NUL character when the source string doesn't fit in the destination buffer. Replace it with strlcpy. strncat is misused as its size argument refers to the source string, not the destination buffer. Replace it with strlcat. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-01-08merge: http://linuxtv.org/hg/~pinchartl/uvcvideoMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-08merge from mainPatrick Boettcher
From: Patrick Boettcher <pb@linuxtv.org> Priority: normal Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
2009-01-08[PATCH] add Terratec Cinergy T Express to dibcom driverPatrick Boettcher
From: Yusuf Altin <yusuf.altin@t-online.de> This patch introduces support for dvb-t for the following dibcom based card: Terratec Cinergy T Express (USB-ID: 0ccd:0062) Priority: normal Signed-off-by: Yusuf Altin <yusuf.altin@t-online.de> Signed-off-by: Albert Comerma <albert.comerma@gmail.com> Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
2009-01-08gspca - m5602-po1030: Probe read only register at probe timeErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Currently, we're probing r/w registers at probe time. This is potentially dangerous, probe some read only registers instead. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-08gspca - m5602-po1030: Remove unnecessary error checkErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-08gspca - m5602-po1030: Add auto white balancing controlErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Add a po1030 auto white balancing control that's disabled by default Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-08README.patches: update ML and -git trees informationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-07gspca - m5602-po1030: Set all v4l2 controls at sensor initErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Previously many of the v4l2 ctrls were set to their initial values at resume from ram/disk. This patch enforces the values stored in the ctrl cache. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-07gspca - m5602-po1030: Simplify register definesErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> This patch renames some register defines in the ov9650 sensor. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-07gspca - jpeg subdrivers: One quantization table per subdriver.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-07gspca - m5602-po1030: Rename register defines, add missing ones.Erik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> The po1030 register defines are unnecessarily complex, simplify them and also add some missing ones. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-07backport commit b305271861219f0ce162eb565f0f28f4c781299dMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Jean Delvare <khali@linux-fr.org> i2c: Drop I2C_CLASS_CAM_DIGITAL There are a number of drivers which set their i2c bus class to I2C_CLASS_CAM_DIGITAL, however no chip driver actually checks for this flag, so we might as well drop it now. kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-07backport commit 9b4778f680aa79d838ae2be6ab958938f744ce5fMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Harvey Harrison <harvey.harrison@gmail.com> trivial: replace last usages of __FUNCTION__ in kernel __FUNCTION__ is gcc-specific, use __func__ kernel-sync: Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-08backport changeset f41ced8f108cc80f16509b907cd7ac93944459bcMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Laurent Pinchart <laurent.pinchart@skynet.be> Check fops_get() return value Several subsystem open handlers dereference the fops_get() return value without checking it for nullness. This opens a race condition between the open handler and module unloading. A module can be marked as being unloaded (MODULE_STATE_GOING) before its exit function is called and gets the chance to unregister the driver. During that window open handlers can still be called, and fops_get() will fail in try_module_get() and return a NULL pointer. This change checks the fops_get() return value and returns -ENODEV if NULL. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-08[PATCH] v4l/tvp514x: Don't write after line endMauro Carvalho Chehab
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> to avoid: | tvp514x 0-005c: No platform data | !!<3>tvp514x 0-005d: No platform data Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-08Bad: author doesn't exist!Mauro Carvalho Chehab
2009-01-07gspca - ov534: Disable the Hercules webcams.Jean-Francois Moine
From: Antonio Ospite <ospite@studenti.unina.it> The Hercules webcam based on ov534 use different sensor than Playstation Eye, disable them until full support is provided. Priority: normal Signed-off-by: Antonio Ospite <ospite@studenti.unina.it> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-07gspca - zc3xx / zc0301: Handle the 0ac8:303b instead of zc0301.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> This webcam is generic and some sensors are not treated by the driver zc0301. Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-07gspca - stv06xx: Add ctrl caching to the vv6410.Jean-Francois Moine
From: Erik Andren <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andren <erik.andren@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-07gspca - stv06xx: Plug a memory leak in the pb0100 sensor driver.Jean-Francois Moine
From: Erik Andren <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andren <erik.andren@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-07gspca - main: Remove #include version.h.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-07merge: v4l-dvbJean-Francois Moine
2009-01-07cx88: Fix Kconfig MPEG dependenciesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> As Michael Krufky <mkrufky@linuxtv.org> pointed, the dependencies for cx8802 are wrong, since the module is needed when either cx88-dvb or cx88-blackbird is compiled. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-07removed unused #include <version.h>'sMauro Carvalho Chehab
From: Huang Weiyi <weiyi.huang@gmail.com> Removed unused #include <version.h>'s in files below, drivers/media/video/cs5345.c drivers/media/video/pwc/pwc-if.c drivers/media/video/saa717x.c drivers/media/video/upd64031a.c drivers/media/video/upd64083.c drivers/media/video/uvc/uvc_ctrl.c drivers/media/video/uvc/uvc_driver.c drivers/media/video/uvc/uvc_queue.c drivers/media/video/uvc/uvc_video.c drivers/media/video/uvc/uvc_status.c Signed-off-by: Huang Weiyi <weiyi.huang@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-07em28xx: fix input selectionMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> em28xx were trying to access the third input entry, even for boards that don't support it. This patch reviews the input mux selection fixing this bug and a few other troubles, like not validating the input on one userspace ioctl. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-06cx88: Fix some Kbuild troublesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> As Randy Dunlap <randy.dunlap@oracle.com> reported, cx88 has some compilation issues: drivers/built-in.o: In function `cx88_call_i2c_clients': (.text+0x20af17): undefined reference to `videobuf_dvb_get_frontend' drivers/built-in.o: In function `cx8802_probe': cx88-mpeg.c:(.devinit.text+0x268c4): undefined reference to `videobuf_dvb_alloc_frontend' cx88-mpeg.c:(.devinit.text+0x268ea): undefined reference to `videobuf_dvb_dealloc_frontends' With those configs: CONFIG_VIDEO_CX88=y CONFIG_VIDEO_CX88_BLACKBIRD=y CONFIG_VIDEO_CX88_DVB=m CONFIG_DVB_CORE=m After carefully examining the code, with the current code, several cx88 drivers (cx8800, cx8802, cx88_dvb and cx88_blackbird) should be compiled as a module, if one of them is marked as such. Just fixing Kconfig could create a very complex set of rules. Also, this hides a problem with the current approach where the dvb functionality weren't confined inside dvb module. What happens is that: - cx88-i2c (part of cx8800) has some special rules if DVB; - cx88-mpeg (cx8802 module) has also part of DVB init code; - cx88-dvb has the rest of the dvb code; - cx88-blackbird can be used with cx88-mpeg, having cx88-dvb or not. So, instead of doing some tricks at Kconfig and wait for a next breakage, this patch moves the dvb code inside cx88-i2c and cx88-mpeg into cx88-dvb. Another problem is that cx8802 were being compiled, even without cx88-dvb and cx88-blackbird modules. While on this code, let's fix also a reported problem: http://www.linuxtv.org/pipermail/linux-dvb/2009-January/031225.html A solution for the issue were proposed here: http://www.mail-archive.com/linux-media@vger.kernel.org/msg00021.html Thanks to Randy, Andy, Gregoire and Thomas for helping us to detect and solve the issues. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-06tveeprom: update to include Hauppauge tuners 151-155Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Priority: normal Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2009-01-29dib0700: add data debug to dib0700_i2c_xfer_newMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Data debug for i2c transactions was provided by the functions called by dib0700_i2c_xfer_legacy, but not dib0700_i2c_xfer_new. This patch adds the missing data debug dumps to dib0700_i2c_xfer_new. Priority: normal Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2009-01-06gspca - m5602-ov9650: Improve the vflip quirk handling.Erik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Regardless of the actual sensor orientation vflip = 0 is normal, and vflip = 1 is upside down. This patch makes that happen Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-06gspca - m5602-mt9m111: Remove the unused power_down struct memberErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> The power_down sensor struct member is almost has no purpose in the current driver abstraction. Remove it. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-06gspca - m5602-s5k4aa: Convert to use the v4l2 ctrl cacheErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-06dm1105: Fix build with INPUT=m and DVB_DM1105=yMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> As reported by Randy Dunlap <randy.dunlap@oracle.com>: With CONFIG_INPUT=m and CONFIG_DVB_DM1105=y: drivers/built-in.o: In function `input_sync': dm1105.c:(.text+0x120c33): undefined reference to `input_event' drivers/built-in.o: In function `dm1105_emit_key': dm1105.c:(.text+0x120c6c): undefined reference to `input_event' dm1105.c:(.text+0x120c82): undefined reference to `input_event' dm1105.c:(.text+0x120cb2): undefined reference to `input_event' dm1105.c:(.text+0x120cd1): undefined reference to `input_event' drivers/built-in.o: In function `dm1105_ir_init': (.devinit.text+0xd8ae): undefined reference to `input_allocate_device' drivers/built-in.o: In function `dm1105_ir_init': (.devinit.text+0xd9f6): undefined reference to `input_register_device' drivers/built-in.o: In function `dm1105_ir_init': (.devinit.text+0xda09): undefined reference to `input_free_device' drivers/built-in.o: In function `dm1105_ir_exit': (.devexit.text+0xcde): undefined reference to `input_unregister_device' This is due to the lack of a dependency between dm1105 and CONFIG_INPUT Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> CC: Igor M. Liplianin <liplianin@me.by>
2009-01-06gspca - m5602-po1030: Convert to have a v4l2 ctrl cacheErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Let the po1030 have a local v4l2 ctrl cache as this minimizes the load on reading the registers and improves performance. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-04-03gspca - m5602-s5k83a: Add rotation, ctrl cache. Rename some ctrls.Erik Andr?n
From: Luk?? Karas <lukas.karas@centrum.cz> s5k83a sensor mounted on many acer laptops have a swiwel allowing it to be rotated. When the camera is in its rotated state, the image needs to be flipped. The only way to check for if the camera has been flipped is to continously poll a register in the m5602. This patch creates a kernel thread which does this. This patch renames some v4l2 ctrls and finally implements a cache in order to prevent unnecessary sensor reads. Priority: normal Signed-off-by: Luk?? Karas <lukas.karas@centrum.cz> Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-06compat.h: Fix a small error at the compat codeMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> CC: Nicola Soranzo <nsoranzo@tiscali.it>
2009-01-06fix compile with Fedora 10 kernelMauro Carvalho Chehab
From: Nicola Soranzo <nsoranzo@tiscali.it> Fix compile error about ioremap_nocache with kernel 2.6.27.9 shipped by Fedora 10. Signed-off-by: Nicola Soranzo <nsoranzo@tiscali.it> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-05Fix an error on cx25840Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> On Mon, 2009-01-05 at 15:10 +0100, Gregoire Favre wrote: > Hello, > > compilation of today v4l-hg fails at : > > CC [M] /usr/src/CVS/v4l-dvb/v4l/cx23885-417.o > CC [M] /usr/src/CVS/v4l-dvb/v4l/cx25840-core.o > /usr/src/CVS/v4l-dvb/v4l/cx25840-core.c:186: error: duplicate 'static' > make[2]: *** [/usr/src/CVS/v4l-dvb/v4l/cx25840-core.o] Error 1 > make[1]: *** [_module_/usr/src/CVS/v4l-dvb/v4l] Error 2 > make[1]: Leaving directory `/usr/src/linux-2.6.28-gentoo' > make: *** [default] Error 2 I find the output of an sparse build amusing: marune/build/v4l-dvb-master/v4l/cx25840-core.c:186:8: error: Just how static do you want this type to be? /marune/build/v4l-dvb-master/v4l/cx25840-core.c:186: error: duplicate 'static' make[3]: *** [/marune/build/v4l-dvb-master/v4l/cx25840-core.o] Error 1 The change that introduced it follows. The first part of the change, with the 2 "static"s is the problem. The second part of the change, for older kernels is correct. Remove the duplicate static keyword and the code will compile. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-04cx18: Fix bad audio in first analog capture.Andy Walls
From: Andy Walls <awalls@radix.net> Normalize the APU state before the second firmware load so that audio for the first analog capture is correct. Many thanks to Conexant for supporting me in finding a solution for this problem. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-01-04gspca - m5602-mt9m111: Convert the mt9m111 to use a v4l2 ctrl cacheErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-04-05gspca - zc3xx: Bad probe of many webcams since adcm2700 addition.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-03-27gspca - main: Use usb interface as parent.Jean-Francois Moine
From: Hans de Goede <hdegoede@redhat.com> Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-03-27gspca - mr97310a: Return good error code in mod_init.Jean-Francois Moine
From: Alexey Klimov <klimov.linux@gmail.com> Priority: normal Signed-off-by: Alexey Klimov <klimov.linux@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-03-12gspca - t613: Do sensor reset only for sensor om6802.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-04gspca - m5602: Minor cleanupsErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Remove an unnecessary error check and reorder some code. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-04gspca - m5602: Don't touch hflip/vflip register on Read/Modify/WriteErik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> Touching the hflip/vflip register while doing the read/modify/write corrupts the image. Just read from the sensor ctrl cache instead and all is good. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-04gspca - m5602: Move the vflip quirk to probe stage.Erik Andr?n
From: Erik Andr?n <erik.andren@gmail.com> The vflip quirk is better checked at probe time as it's only needed once. Also add an extra reset at init time to resolve a suspend to ram regression. Priority: normal Signed-off-by: Erik Andr?n <erik.andren@gmail.com>
2009-01-04uvcvideo: Fix GET_DEF failure detection.Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> Commit 44f0079ec74330b457d990072c13cbe28b0f1abf erroneously considers all GET_DEF requests as unsuccessful. Fix this by checking the request return value. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-01-03uvcvideo: Print the UVC version number in binary-coded decimal.Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> The UVC specification release number is a binary-coded decimal number, print it as such. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-01-03uvcvideo: Whitespace and comments cleanup, copyright updates.Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>