summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
2009-06-17merge: http://linuxtv.org/hg/~tap/fixMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-17pxa-camera: fix typoTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> v4l2_bound_align_image should be v4l_bound_align_image. Change comment to match coding style. Should be merged with cb48209c1841 pxa-camera: Use v4l bounding/alignment function Priority: high Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-06-16cx88: Properly support Leadtek TV2000 XP GlobalMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Fix Leadtek TV2000 XP Global entries and add missing PCI ID's. Thanks to Terry Wu <terrywu2009@gmail.com> for pointing us for the proper settings. Priority: normal CC: Terry Wu <terrywu2009@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-16v4l2: Fix flaw in alignment codeTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> It's possible that the height alignment would be increased beyond the maximum possible value when trying to satisfy size alignment. Please fold with b4d3ec8d363d v4l2: Create helper function for bounding and aligning images Priority: high Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-06-16backport commit c2e5307b902426247afa48d3f1ed4fa5409dcb49Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Author: Valentin Longchamp <valentin.longchamp@epfl.ch> Date: Wed May 6 11:54:48 2009 +0200 mx31: changed CONSISTENT_DMA_SIZE to 8M for mx31 video Priority: normal Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-16Backport language typo and whitespace differencesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-16poll method lose race conditionMauro Carvalho Chehab
From: Figo.zhang <figo1802@gmail.com> bttv-driver.c,cx23885-video.c,cx88-video.c: poll method lose race condition for capture video. Signed-off-by: Figo.zhang <figo1802@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-14gspca-ov519: add extra controlshans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> This patch adds autobrightness (so that it can be turned off to make the already present brightness control work) and light frequency filtering controls. The lightfreq control needed 2 different entries in the ctrls array, as the number of options differs depending on the sensor. Always one of the 2 entires is disabled ofcourse. Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-06-13gspca: fix NULL pointer deref in query_ctrlhans@rhel5-devel.localdomain
From: Hans de Goede <hdegoede@redhat.com> gspca: fix NULL pointer deref in query_ctrl Priority: normal Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2009-06-12v4l2: Move bounding code outside I2C ifdef blockMauro Carvalho Chehab
From: Trent Piepho <xyzzy@speakeasy.org> On Fri, 12 Jun 2009, Randy Dunlap wrote: > From: Randy Dunlap <randy.dunlap@oracle.com> > > Move v4l_bound_align_image() outside of an #ifdef CONFIG_I2C block > so that it is always built. Fixes a build error: clamp_align() should be moved as well, since it's only used by v4l_bound_align_image(). I'm attaching an alternate version that fixes this. Labeled the endif too. Reported-by: Randy Dunlap <randy.dunlap@oracle.com> Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-12uvc: Fix for no return value check of uvc_ctrl_set() which calls ↵Mauro Carvalho Chehab
mutex_lock_interruptible() From: Robert Krakora <rob.krakora@messagenetsystems.com> Fix for no return value check of uvc_ctrl_set() which calls mutex_lock_interruptible(). Priority: normal Signed-off-by: Robert Krakora <rob.krakora@messagenetsystems.com> Acked-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-12gspca - spca508: Extend the write_vector routine.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> 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-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-09se401: Fix coding styleMauro Carvalho Chehab
From: Alan Cox <alan@linux.intel.com> Having fixed the sprintfs I decided a quick clean wouldn't do any harm so it was actually easy to read in future. Priority: normal Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-09gspca - stv06xx: remove needless if check and gotoMauro Carvalho Chehab
From: Alexey Klimov <klimov.linux@gmail.com> Patch removes needless if check and goto. Signed-off-by: Alexey Klimov <klimov.linux@gmail.com> Reviewed-by: Erik Andrén <erik.andren@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-09DaVinci: DM646x Video: Makefile and config files modifications for DisplayHans Verkuil
From: Chaithrika U S <chaithrika@ti.com> Makefile and Kconfig changes Modifies and adds the video Makefiles and Kconfig files to support DM646x Video display device Priority: normal Signed-off-by: Manjunath Hadli <mrh@ti.com> Signed-off-by: Brijesh Jadav <brijesh.j@ti.com> Signed-off-by: Chaithrika U S <chaithrika@ti.com> Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-06-09DaVinci: DM646x Video: Add VPIF display driverHans Verkuil
From: Chaithrika U S <chaithrika@ti.com> Display driver for VPIF Adds the VPIF display driver and the associated header file. Priority: normal Signed-off-by: Manjunath Hadli <mrh@ti.com> Signed-off-by: Brijesh Jadav <brijesh.j@ti.com> Signed-off-by: Chaithrika U S <chaithrika@ti.com> Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-06-09DaVinci: DM646x Video: VPIF driverHans Verkuil
From: Chaithrika U S <chaithrika@ti.com> Video Port Interface driver Add VPIF driver for DM646x. This code be used by the display and capture drivers. Priority: normal Signed-off-by: Manjunath Hadli <mrh@ti.com> Signed-off-by: Brijesh Jadav <brijesh.j@ti.com> Signed-off-by: Chaithrika U S <chaithrika@ti.com> Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-06-14Change lnbh24 configure bits for NetUP card.Igor M. Liplianin
From: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru>
2009-06-07saa7134: add support for AVerMedia M103 (f736)Mauro Carvalho Chehab
From: Barry Kitson <b.kitson@gmail.com> Add 1461:f736 to the list of identifiers corresponding to the SAA7134_BOARD_AVERMEDIA_M103 board. This patch adds support for a variant of the AVerMedia M103 MiniPCI DVB-T Hybrid card. Signed-off-by: Barry Kitson <b.kitson@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-06v4l2-device: fix incorrect kernel checkHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> i2c_unregister_device must be called on kernels >= 2.6.26, not just for kernels >= 2.6.29. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-06-09v4l2: add new s_config subdev ops and v4l2_i2c_new_subdev_cfg/board callsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Add a new s_config core ops call: this is called with the irq and platform data to be used to initialize the subdev. Added new v4l2_i2c_new_subdev_cfg and v4l2_i2c_new_subdev_board calls that allows you to pass these new arguments. The existing v4l2_i2c_new_subdev functions were modified to also call s_config. In the future the existing v4l2_i2c_new_subdev functions will be replaced by a single v4l2_i2c_new_subdev function similar to v4l2_i2c_new_subdev_cfg but without the irq and platform_data arguments. Priority: normal Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2009-06-06merge: http://kernellabs.com/hg/~dheitmueller/misc-fixes-2Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-06zr364xx.c: vfree does its own NULL checkMauro Carvalho Chehab
From: Figo.zhang <figo1802@gmail.com> vfree() does it's own NULL checking, no need for explicit check before calling it. Signed-off-by: Figo.zhang <figo1802@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-05ivtv: Fix PCI directionMauro Carvalho Chehab
From: Alan Cox <alan@linux.intel.com> The ivtv stream buffers may be for receive or for send but the attached sg handle is always destined cpu->device. We flush it correctly but the allocation is wrongly done with the same type as the buffers. See bug: http://bugzilla.kernel.org/show_bug.cgi?id=13385 (Note this doesn't close the bug - it fixes the ivtv part and in turn the logging next shows up some rather alarming DMA sg list warnings in libata) Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-04V4L/pwc - use usb_interface as parent, not usb_deviceMauro Carvalho Chehab
From: Lennart Poettering <mzxreary@0pointer.de> The current code creates a sysfs device path where the video4linux device is child of the usb device itself instead of the interface it belongs to. That is evil and confuses udev. This patch does basically the same thing as Kay's similar patch for the ov511 driver: http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=ce96d0a44a4f8d1bb3dc12b5e98cb688c1bc730d Signed-off-by: Lennart Poettering <mzxreary@0pointer.de> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-04Add missing __devexit_p()Mauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> Add missing __devexit_p() to several drivers. Also add a few missing __init, __devinit and __exit markers. These errors could result in build failures depending on the kernel configuration. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@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-03Partially backport changeset 5ec629d784adMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> By mistake, I've committed a changeset that it is not done yet together with a fix. Revert the broken part of the old changeset. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-03buf-core.c: add pointer checkMauro Carvalho Chehab
From: Figo.zhang <figo1802@gmail.com> add poiter check for videobuf_queue_core_init(). any guys who write a v4l driver, pass a NULL pointer or a non-inintial pointer to the first parameter such as videobuf_queue_sg_init() , it would be crashed. Signed-off-by: Figo.zhang <figo1802@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-01tuner-xc3028: fix frequency offsetMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> The last changeset has an else missing, causing wrong frequencies for DTV6. Thanks to Terry Wu <terrywu2009@gmail.com> for pointing the issue. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
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-06-01merge: http://linuxtv.org/hg/~tap/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
2009-06-01merge: 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-06-01merge: http://linuxtv.org/hg/~dougsland/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.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>