summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2009-05-11merge: http://linuxtv.org/hg/~awalls/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-05-11merge: http://linuxtv.org/hg/~mcisely/pvrusb2-devMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-05-11soc_camera: depends on I2CGuennadi Liakhovetski
From: Randy Dunlap <randy.dunlap@oracle.com> soc_camera uses i2c_*() functions and has build errors when CONFIG_I2C=n: ERROR: "i2c_new_device" [drivers/media/video/soc_camera.ko] undefined! ERROR: "i2c_get_adapter" [drivers/media/video/soc_camera.ko] undefined! ERROR: "i2c_put_adapter" [drivers/media/video/soc_camera.ko] undefined! ERROR: "i2c_unregister_device" [drivers/media/video/soc_camera.ko] undefined! Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
2009-05-10cx18: Initial attempt to get sliced VBI working for 625 line systemsAndy Walls
From: Andy Walls <awalls@radix.net> Initial changes to get sliced VBI for 625 line system working. This is patch is untested. Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-05-09pvrusb2: Allocate a routing ID for future support of Terratec Grabster AV400Mike Isely
From: Mike Isely <isely@pobox.com> Priority: normal Signed-off-by: Mike Isely <isely@pobox.com>
2009-05-09soc-camera: Fix section mismatch warningGuennadi Liakhovetski
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de> modpost needs a __refdata marker in driver structs to ensure references to .probe and .remove functions from .devinit.text and .devexit.text sections respectively are valid. Add __refdata to soc_camera_pdrv platform driver. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> --- drivers/media/video/soc_camera.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
2009-05-09merge: http://linuxtv.org/hg/~jfrancois/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-05-09merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-05-09merge: http://linuxtv.org/hg/~awalls/cx18-av-coreMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-05-09merge: http://www.linuxtv.org/hg/~stoth/tda10048Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-05-08tveeprom: Point the TCL MNM05-4 tuner entry to an actual tuner definitionAndy Walls
From: Andy Walls <awalls@radix.net> The TCL MNM05-04 is used on some HVR-1600 models. It appears to be similar to the TCL MFMN05-4 but without FM radio. The TUNER_PHILIPS_FM1236_MK3 tuner definition appears to be the proper existing tuner definition to use for this tuner. Reported-by: Matt Beadon <matt.beadon@gmail.com> Priority: normal Tested-by: Matt Beadon <matt.beadon@gmail.com> Signed-off-by: Andy Walls <awalls@radix.net>
2009-05-08cx18: Add missing newline to tuner detection error messageAndy Walls
From: Andy Walls <awalls@radix.net> Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-05-08cx23885: add ATSC/QAM tuning support for Hauppauge WinTV-HVR1255Michael Krufky
From: Michael Krufky <mkrufky@kernellabs.com> Priority: normal Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
2009-05-08cx23885: add ATSC/QAM tuning support for Hauppauge WinTV-HVR1275Michael Krufky
From: Michael Krufky <mkrufky@kernellabs.com> Priority: normal Signed-off-by: Michael Krufky <mkrufky@kernellabs.com>
2009-05-08saa7134-video.c: fix the block bugMauro Carvalho Chehab
From: figo.zhang <figo.zhang@kolorific.com> when re-open or re-start (video_streamon), the q->curr would not be NULL in saa7134_buffer_queue(), and all the qbuf will add to q->queue list,no one to do activate to start DMA,and then no interrupt would happened,so it will be block. In VIDEOBUF_NEEDS_INIT state, initialize the curr pointer to be NULL in the buffer_prepare(). Signed-off-by: Figo.zhang <figo.zhang@kolorific.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-16merge: http://kernellabs.com/hg/~dheitmueller/em28xx-no-audioMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-15merge: http://www.linuxtv.org/hg/~dougsland/em28xxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-15merge: http://linuxtv.org/hg/~jfrancois/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-15merge: 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-06-15ov511: Fix unit_video parameter behaviorMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Fix a regression caused by changeset 9133:64aed7485a43 - v4l: disconnect kernel number from minor Before the above changeset, ov511_probe used to allow forcing to use a certain specific set of video devices, like: modprobe ov511 unit_video=4,1,3 num_uv=3 So, assuming that you have 5 ov511 devices, and connect they one by one, they'll gain the following device numbers (at the connection order): /dev/video4 /dev/video1 /dev/video3 /dev/video0 /dev/video2 However, this was changed due to this change at video_register_device(): + nr = find_next_zero_bit(video_nums[type], minor_cnt, nr == -1 ? 0 : nr); With the previous behavior, a trial to register on an already allocated mirror would fail, and a loop would get the next requested minor. However, the current behavior is to get the next available minor instead of failing. Due to that, this means that the above modprobe parameter will give, instead: /dev/video5 /dev/video6 /dev/video7 /dev/video8 /dev/video9 In order to restore the original behavior, a static var were added, storing the amount of already registered devices. While there, it also fixes the locking of the probe/disconnect functions. Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-12merge: v4l-dvbJean-Francois Moine
2009-06-12v4l: i2c modules must be linked before the v4l2 driversHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Since i2c autoprobing is no longer supported by v4l2 we need to make sure that the i2c modules are linked before the v4l2 modules. The v4l2 modules now rely on the presence of the i2c modules, so these must have initialized themselves before the v4l2 modules. The exception is the ir-kbd-i2c module, which is the only one still using autoprobing. This one should be loaded at the end of the v4l2 module. Loading it earlier actually causes problems with tveeprom. Once ir-kbd-i2c is no longer autoprobing, then it has to move up as well. This is only an issue when everything is compiled into the kernel. Thanks to Marcus Swoboda for reporting this and Udo Steinberg for testing this patch. Priority: high Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Tested-by: Udo A. Steinberg <udo@hypervisor.org>
2009-06-12gspca - ov534: Do the ov772x work again.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The scan of the image packets of the sensor ov772x was broken when the sensor ov965x was added. Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-06-11merge: http://linuxtv.org/hg/~dougsland/video4linuxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-11merge: http://linuxtv.org/hg/~awalls/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-11merge: http://linuxtv.org/hg/~pinchartl/uvcvideo/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-11merge: http://linuxtv.org/hg/~eandren/v4l-dvb/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-11gspca - m5602-ov9650: Reorder quirk list and add A7V quirkErik Andrén
From: Erik Andrén <erik.andren@gmail.com> The quirk list has grown and was in need of sorting. This is now done. Add a new vflip quirk for the ASUS A7V while we're at it. Thanks to Carsten Menzel for reporting. Priority: normal Signed-off-by: Erik Andrén <erik.andren@gmail.com>
2009-06-11tvp514x: try_count off by oneDouglas Schilling Landgraf
From: Roel Kluin <roel.kluin@gmail.com> With `while (try_count-- > 0)' try_count reaches -1 after the loop. Priority: normal Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2009-06-11v4l: generate KEY_CAMERA instead of BTN_0 key events on input devicesDouglas Schilling Landgraf
From: Lennart Poettering <mzxreary@0pointer.de> A bunch of V4L drivers generate BTN_0 instead of KEY_CAMERA key presses. X11 is able to handle KEY_CAMERA automatically these days while BTN_0 is not treated at all. Thus it would be of big benefit if the camera drivers would consistently generate KEY_CAMERA. Some drivers (uvc) already do, this patch updates the remaining drivers to do the same. I only possess a limited set of webcams, so this isn't tested with all cameras. The patch is rather trivial and compile tested, so I'd say it's still good enough to get merged. Priority: normal Signed-off-by: Lennart Poettering <mzxreary@0pointer.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2009-06-11se401: Fix unsafe use of sprintf with identical source/destinationDouglas Schilling Landgraf
From: Alan Cox <alan@linux.intel.com> Closes-bug: http://bugzilla.kernel.org/show_bug.cgi?id=13435 Priority: normal Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2009-06-11usbvision-core.c: vfree does its own NULL checkDouglas Schilling Landgraf
From: Figo.zhang <figo1802@gmail.com> vfree() does it's own NULL checking,so no need for check before calling it. Priority: normal Signed-off-by: Figo.zhang <figo1802@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2009-06-10V4L: return -ENOMEMDouglas Schilling Landgraf
From: Figo.zhang <figo1802@gmail.com> it is better return -ENOMEM than -EIO Priority: normal Signed-off-by: Figo.zhang <figo1802@gmail.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2009-06-10gspca - main: Skip disabled controls.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-06-09em28xx: don't create audio device if not supportedDevin Heitmueller
From: Devin Heitmueller <dheitmueller@kernellabs.com> In cases where the device does not actually provide a USB audio class *or* vendor audio, do not load the driver that provides vendor audio support (such as the KWorld 2800d). Otherwise, the /dev/audio1 device file gets created and users get confused. Also, reworks the logic a bit so that we don't try to inspect the register content if the register read failed entirely. Priority: normal Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
2009-06-09cx18: Add DVB-T support for the Leadtek WinFast DVR3100 HAndy Walls
From: Andy Walls <awalls@radix.net> This adds support for DVB-T on the Leadtek DVR3100 H and should also get analog TV capture from the tuner working properly as well. DVB-T 6 MHz and 8 MHz have been tested and verified to work by Terry Wu of Leadtek. DVB-T 7 MHz has also been verified working with a change developed by Terry to the tuner-xc2028.c driver. Special thanks go to Terry Wu <terrywu2009@gmail.com> of Leadtek who provided the needed information and testing to get digital TV working for the Leadtek DVR3100 H. Reported-by: Terry Wu <terrywu2009@gmail.com> Priority: normal Tested-by: Terry Wu <terrywu2009@gmail.com> Signed-off-by: Andy Walls <awalls@radix.net>
2009-06-09cx18: Split LeadTek PVR2100 and DVR3100 H into 2 separate card entriesAndy Walls
From: Andy Walls <awalls@radix.net> Priority: normal Signed-off-by: Andy Walls <awalls@radix.net>
2009-06-09uvcvideo: Ignore non-UVC trailing interface descriptors.Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> Herton Ronaldo Krzesinski from Mandriva reported that one Bison Electronics webcam exposes a non-UVC interface descriptor. Instead of failing completely, ignore trailing non-UVC descriptors and move on. Thanks to Herton for reporting the problem and submitting a patch proposal. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-09uvcvideo: Add support for FSC V30S webcamsLaurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> The FSC WebCam V30S (18ec:3288) requires the MINMAX quirk. Add a corresponding entry in the device IDs list. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-09uvcvideo: Add support for Aveo Technology webcamsLaurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> The Aveo Technology USB 2.0 Camera (1871:0306) requires the PROBE_EXTRAFIELDS quirk. Add a corresponding entry in the device IDs list. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-07gspca - ov519: Add support for the ov518 bridge.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-06-06em28xx: Add Kworld 315 entryDouglas Schilling Landgraf
From: Franklin Meng <fmeng2002@yahoo.com> Added an entry for Kworld 315 (for while, dvb only) Priority: normal Signed-off-by: Franklin Meng <fmeng2002@yahoo.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2009-06-06em28xx: set up tda9887_conf in em28xx_card_setup()Douglas Schilling Landgraf
From: Franklin Meng <fmeng2002@yahoo.com> Added tda9887_conf set up into em28xx_card_setup() Priority: normal Signed-off-by: Franklin Meng <fmeng2002@yahoo.com> Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
2009-06-04uvcvideo: Don't accept to change the format when buffers are allocated.Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> Setting a new frame format or size will likely change the buffer size required to store a complete video frame. To avoid a buffer overflow, don't allow VIDIOC_S_FMT calls when video buffers are already allocated. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-06-01gspca - m5602-ov9650: Add vflip quirk for the ASUS A6VAErik Andrén
From: Erik Andrén <erik.andren@gmail.com> Add vflip quirk for the ASUS A6VA. Thanks to Salvo Di Rosa for reporting. Priority: normal Signed-off-by: Erik Andrén <erik.andren@gmail.com>
2009-05-31uvcvideo: Add generic control blacklist.Laurent Pinchart
From: Laurent Pinchart <laurent.pinchart@skynet.be> Another device (5986:0241) has been reported to advertise a UVC control it does not support. Rework the control blacklist to match devices by their VID:PID instead of trying to be clever about which controls might not be supported properly. Priority: normal Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be>
2009-05-29gspca - spca505: Reinitialize the webcam at resume time.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Priority: normal Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2009-05-28big rework of TS for saa7134Mauro Carvalho Chehab
From: Dmitri Belimov <d.belimov@gmail.com> 1. Add start/stop TS function. 2. Move setup DMA of TS to DMA function. 3. Write support cupture via MMAP 4. Rework startup and finish process, remove simple FSM. Signed-off-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Alexey Osipov <lion-simba@pridelands.ru> Tested-by: Hermann Pitton <hermann-pitton@arcor.de> Tested-by: Beholder Intl. Ltd. Dmitry Belimov <d.belimov@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-05-28vino: replace dma_sync_single with dma_sync_single_for_cpuMauro Carvalho Chehab
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> This replaces dma_sync_single() with dma_sync_single_for_cpu() because dma_sync_single() is an obsolete API; include/linux/dma-mapping.h says: /* Backwards compat, remove in 2.7.x */ Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-10Fix v4l2-device usage of i2c_unregister_device()Mauro Carvalho Chehab
From: Randy Dunlap <randy.dunlap@oracle.com> Fix v4l2-device usage of i2c_unregister_device() and handle the case of CONFIG_I2C=m & CONFIG_MEDIA_VIDEO=y. Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>