summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video
AgeCommit message (Collapse)Author
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-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-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-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-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-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-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-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>
2009-05-30cx231xx: TRY_FMT should not actually set anythingTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> In the TRY_FMT handler the function get_scale() is called to find what the scaler hardware will produce for a requested size. The problem is that get_scale(struct cx231xx *dev, ..., unsigned int *vscale, unsigned int *hscale) saves the calculated scale values into both the pointer arguments and into dev's hscale and vscale fields. TRY_FMT shouldn't actually change anything in the device state. The code to in get_scale() that writes to dev->[hv]scale can just be deleted. In all cases when dev's fields should be modified, get_scale() was called with get_scale(dev, ..., &dev->hscale, &dev->vscale), so dev was getting updated anyway. This didn't actually cause a problem because nothing ever actually made use of the hscale and vscale fields. I changed cx231xx_resolution_set() to use those fields rather than re-calculate them with a call to get_scale(). Updating [hv]scale in cx231xx_resolution_set() isn't necessary because every call of cx231xx_resolution_set() was already preceded by a call to get_scale() or setting the [hv]scale fields, so they will be always be up-to-date w.r.t. width and height. Removing the call to get_scale() from cx231xx_resolution_set() allowed making get_scale() a static function, which is a good thing for something with such a short name. There is already another function with the same name in the em28xx driver, but that one is static. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-05-30em28xx: Use v4l bounding/alignment functionTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l function has a better algorithm for aligning image size. It appears that the em2800 can only scale by 50% or 100%, i.e. the only heights supported might be 240 and 480. In that case the old code would set any height other than 240 to 480. Request 240 get 240, but request 239 and then you get 480. Change it to round to the nearest supported value. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2009-05-30cx231xx: Use v4l bounding/alignment functionTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l function has a better algorithm for aligning image size. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> CC: Srinivasa Deevi <srinivasa.deevi@conexant.com>
2009-05-30mt9: Use v4l bounding/alignment functionTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> The v4l function has a better algorithm for aligning image size. Priority: normal Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> CC: Guennadi Liakhovetski <g.liakhovetski@gmx.de>