summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-01-12merge: v4l-dvbJean-Francois Moine
2009-01-12merge: http://linuxtv.org/hg/~awalls/cx88Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-12merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-11zoran: Fix a few CodingStyle issues rised by the previous patchMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com> CC: Jean Delvare <khali@linux-fr.org> CC: Trent Piepho <xyzzy@speakeasy.org>
2009-01-11Convert to be a pci driverMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> This is a really old and crufty driver that wasn't using the long established pci driver framework. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Acked-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-11vivi: Implements 4 inputs on viviMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> This patch adds the capability of selecting between 4 different inputs on vivi driver. Input 0 is the normal color bar, while inputs 1-3 are modified color bars. This allows testing input selection on userspace applications and serves as an implementation model for other drivers. The current approach allows a maximum of 10 different inputs, since the input name generator assumes that we need just one digit to present the input. It shouldn't be hard to modify it to present a bigger name of inputs, but, in fact, it doesn't make much sense of doing it for this test driver. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-10saa7134: Prevent Oops due to stale IRQ status when enabling interruptsAndy Walls
From: Andy Walls <awalls@radix.net> When enabling a shared IRQ line, then saa7134_irq handler could be invoked before the driver had completely set up internal structures, due to a shared interrupt line firing. Clear the saa7134 interrupt status reg, before requesting the irq line, so that stale IRQ status isn't processed before the internal structures are set up. Marcin Slusarz recently brought this Oops to the attention of the v4l-dvb lists and provided an initial analysis by investigating reports found here: http://kerneloops.org/guilty.php?guilty=mute_input_7133&version=2.6.27-release&start=1802240&end=1835007&class=oops Reported-by: Marcin Slusarz <marcin.slusarz@gmail.com> Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-01-10gspca - tv8532: Change the max brightness.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-10gspca - some subdrivers: Don't get the control values from the webcam.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-10gspca - spca508: Cleanup code.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-10saa7127: fix broken S-Video with saa7129Hans Verkuil
From: Martin Dauskardt <martin.dauskardt@gmx.de> Register 0x2d has to be set differently in the saa7129 compared to the saa7127. This was not done correctly, so S-Video was broken in certain circumstances. This fixes a regression introduced in 2.6.28. Priority: high Signed-off-by: Martin Dauskardt <martin.dauskardt@gmx.de> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-01-10pxa_camera needs 2.6.27 at minimum.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-01-10Fix 'stb0899_get_srate' defined but not used warningHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-01-10merge: v4l-dvbJean-Francois Moine
2009-01-09cx23885: Fix Oops for mixed install of analog and digital only cardsAndy Walls
From: Andy Walls <awalls@radix.net> Analog support for HVR-1250 has not been completed, but does exist for the HVR-1800. Since both cards use the same driver, it tries to create the analog dev for both devices, which is not possible. This causes a NULL error to show up in video_open and mpeg_open. -Mark Iterations through the cx23885_devlist must check for NULL pointers as some supported devices only have DVB support at the moment. Mark Jenks encoutered an Oops in a system with both an HVR-1250 and HVR-1800 installed. -Andy Reported-by: Mark Jenks <mjenks1968@gmail.com> Priority: normal Tested-by: Mark Jenks <mjenks1968@gmail.com> Signed-off-by: Mark Jenks <mjenks1968@gmail.com> Signed-off-by: Andy Walls <awalls@radix.net>
2009-01-09gspca - tv8532: Cleanup code.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-09Fix a bug on v4lgrab.cMauro Carvalho Chehab
From: Simon Harrison <si1356@yahoo.co.uk> v4lgrab breaks the fputc macro on some systems, because of #defined FILE. Also, I also added comments because it was not at all clear that to get gspca cameras to work with this application you need v4l1compat. Signed-off-by: Simon Harrison <si1356@yahoo.co.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-09tveeprom: Properly initialize tuner type (BZ#11367)Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> If Hauppauge eeprom is corrupted, the driver returns tuner = 0, instead of TUNER_ABSENT. This makes the drivers to initialize tuner, instead of handling the manual parameter. Since the tuner core rejects that a tuner to have their type changed, this breaks the manual tuner override. Priority: high Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-09zoran: Re-adds udev entry removed by changeset 60b4bde4Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Changeset 60b4bde48b36c0315ef41fd38c339b9c7e68c46f removed an unused struct on zoran driver, when compiled with "Y". However, as pointed by Jean Delvare <khali@linux-fr.org>, this is neeeded when the driver is compiled as a module, since udev relies on it to auto-load the module. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-09firmware/Makefile: Backport upstream changesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-09backport commit 5f820f648c92a5ecc771a96b3c29aa6e90013bbaMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Author: Tejun Heo <htejun@gmail.com> poll: allow f_op->poll to sleep f_op->poll is the only vfs operation which is not allowed to sleep. It's because poll and select implementation used task state to synchronize against wake ups, which doesn't have to be the case anymore as wait/wake interface can now use custom wake up functions. The non-sleep restriction can be a bit tricky because ->poll is not called from an atomic context and the result of accidentally sleeping in ->poll only shows up as temporary busy looping when the timing is right or rather wrong. This patch converts poll/select to use custom wake up function and use separate triggered variable to synchronize against wake up events. The only added overhead is an extra function call during wake up and negligible. This patch removes the one non-sleep exception from vfs locking rules and is beneficial to userland filesystem implementations like FUSE, 9p or peculiar fs like spufs as it's very difficult for those to implement non-sleeping poll method. While at it, make the following cosmetic changes to make poll.h and select.c checkpatch friendly. * s/type * symbol/type *symbol/ : three places in poll.h * remove blank line before EXPORT_SYMBOL() : two places in select.c Oleg: spotted missing barrier in poll_schedule_timeout() Davide: spotted missing write barrier in pollwake() kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-01-08merge: v4l-dvbJean-Francois Moine
2009-01-08gspca - mars: Bad isoc packet scanning.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-08gspca - mars: Optimize, rewrite initialization and add controls.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-01-08gspca - zc3xx: Fix bad variable type with i2c read.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The returned value of i2c read is a 16 bits word. It was stored in a 8 bits variable, preventing a sensor to be detected. Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
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-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 - 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-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-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-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-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>