summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-07-16merge: http://linuxtv.org/hg/~awalls/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-16merge: http://linuxtv.org/hg/~hgoede/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-16merge: http://linuxtv.org/hg/~mkrufky/sms1xxxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-16gspca: zc3xx compile problem.Jean-Francois Moine
From: Mauro Carvalho Chehab <mchehab@infradead.org> zc3xx-reg.h added. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-16libv4l: Add missing COPYING.LIB filehans@localhost.localdomain
2008-07-16gspca: Support of powerline frequency for ov6650.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-16gspca: Bad image size with spca501.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-16gspca: Bad offset of the brightness sum in sn9c103 packets.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-16gspca: Bad check of i2c write to sn9c10x.Jean-Francois Moine
From: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-16gspca: Bad initialization of sn9c103 - ov7630.Jean-Francois Moine
From: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-15dvb-ttpci: Fix build with CONFIG_INPUT_EVDEV=n (Bug #11042)Oliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Fix build with CONFIG_INPUT_EVDEV=n (Bug #11042). Thanks to Toralf Förster <toralf.foerster@gmx.de> for reporting. Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Thanks-to: Toralf Förster <toralf.foerster@gmx.de>
2008-07-15tda10023: Fix typo in tda10023_attach dummy routineOliver Endriss
From: Oliver Endriss <o.endriss@gmx.de> Fix compiler warning caused by a typo in the tda10023_attach dummy routine. Signed-off-by: Oliver Endriss <o.endriss@gmx.de>
2008-07-15gspca: Real names of the zc3xx registers.Jean-Francois Moine
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-15gspca: Better initialization of sn9c120 - ov7660.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-15gspca: Perfect exposure for sn9c10x, sensor ov6650.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-15gspca: 352x288 mode fix and source clean-up for Sonix bridges.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> sonixb: Bad initialization of sensor for 352x288 mode. (from Hans de Goede) sonixj: Clean-up source. Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-14merge: v4l-dvbJean-Francois Moine
2008-07-14zr36067: Load the avs6eyes chip drivers automaticallyMauro Carvalho Chehab
From: Martin Samuelsson <sam.linux.kernel@gmail.com> This enables the avs6eyes to load the bt866 and ks0127 drivers automatically. Signed-off-by: Martin Samuelsson <sam.linux.kernel@gmail.com> Acked-by: Ronald Bultje <rbultje@ronald.bitfreak.net> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-14zr36067: Rework device memory allocationMauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> Allocate zoran devices dynamically. Currently, the zr36067 driver stores the device structures in a global array, with room for 4 devices. This makes the bss section very large (90 kB!), and given that most users, I suspect, have only one zoran device, this is a waste of kernel memory. Allocating the memory dynamically lets us use only the amount of memory we need. Before: text data bss dec hex filename 64754 9230 90224 164208 28170 drivers/media/video/zr36067.o After: text data bss dec hex filename 64866 9230 112 74208 121e0 drivers/media/video/zr36067.o Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Ronald Bultje <rbultje@ronald.bitfreak.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-17uvcvideo: Return sensible min and max values when querying a boolean control.Mauro Carvalho Chehab
From: Laurent Pinchart <laurent.pinchart@skynet.be> Although the V4L2 spec states that the minimum and maximum fields may not be valid for control types other than V4L2_CTRL_TYPE_INTEGER, it makes sense to set the bounds to 0 and 1 for boolean controls instead of returning uninitialized values. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-26uvcvideo: Make the auto-exposure menu control V4L2 compliantMauro Carvalho Chehab
From: Laurent Pinchart <laurent.pinchart@skynet.be> V4L2 and UVC enumerate the auto-exposure settings in a different order. This patch fixes the auto-exposure menu declaration to match the V4L2 spec. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-26saa7134: Copy tuner data earlier in init to avoid overwriting manual tuner typeMauro Carvalho Chehab
From: Simon Arlott <simon@fire.lp0.eu> When saa7134_board_init2 runs, it immediately overwrites the current value (set earlier from module parameter) of tuner_type with the static values, and then does autodetection. This patch moves the tuner_addr copy to earlier in saa7134_initdev and removes the tuner_type copy from saa7134_board_init2. Autodetection could still potentially change to the wrong tuner type, but it is now possible to override the default type for the card again. My card's tuner is configured with autodetection from eeprom, so I don't need to manually set the tuner. I've checked that the autodetection still works for my card. Reviewed-by: Hermann Pitton <hermann-pitton@arcor.de> Cc: Brian Marete <bgmarete@gmail.com> Signed-off-by: Simon Arlott <simon@fire.lp0.eu> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-21usb/anysee.c: make struct anysee_usb_mutex staticMauro Carvalho Chehab
From: Adrian Bunk <bunk@kernel.org> This patch makes the needlessly global struct anysee_usb_mutex static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-21make cx25840_debug staticMauro Carvalho Chehab
From: Adrian Bunk <bunk@kernel.org> cx25840_debug can now become static. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-22mt20xx: test below 0 on unsigned lo1a and lo2aMauro Carvalho Chehab
From: roel kluin <roel.kluin@gmail.com> lo1a and lo2a are unsigned ints so these tests won't work. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-26Add support for the ATI TV Wonder HD 600Mauro Carvalho Chehab
From: Devin Heitmueller <devin.heitmueller@gmail.com> em28xx-cards.c em28xx-dvb.c em28xx.h - Add support for the ATI TV Wonder HD 600, based on a 94 email exchange and USB traces provided by Ronnie Bailey Thanks to Ronnie Bailey <purevw@wtxs.net> for testing the changes Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-22stkwebcam: Always reuse last queued bufferMauro Carvalho Chehab
From: Jaime Velasco Juan <jsagarribay@gmail.com> This change keeps the video stream going on when the application is slow queuing buffers, instead of spamming dmesg and hanging. Fixes a problem with aMSN reported by Samed Beyribey <beyribey@gmail.com> Signed-off-by: Jaime Velasco Juan <jsagarribay@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-22s2255drv Sensoray 2255 driver fixesMauro Carvalho Chehab
From: Dean Anderson <dean@sensoray.com> This patch fixes timer issues in driver disconnect. It also removes the restriction of one user per channel at a time. Thanks to Oliver Neukum and Mauro Chehab for finding these issues. Locking of video stream partly based on saa7134 driver. Signed-off-by: Dean Anderson <dean@sensoray.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-26add dvb-t support for terratec cinergy hybrid T usb xsMauro Carvalho Chehab
From: reinhard schwab <reinhard.schwab@aon.at> This patch adds dvbt support for the terratec cinergy hybrid T usb xsstick. Thanks to Devin Heitmueller and Mauro Chehab for guiding me. Signed-off-by: Reinhard Schwab <reinhard.schwab@aon.at> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-14gspca: Better gain for bridge sn9c10x - sensor ov6650.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> sonixb: Better gain for ov6650. Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-14gspca: 640x480 for bridge sn9c103 / sensor ov7630.Jean-Francois Moine
From: Andoni Zubimendi <andoni.zubimendi@gmail.com> sonixb: 640x480 mode for sn9c103 - ov7630. Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-14gspca: Buffers for USB exchanges cannot be in the stack.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> gspca: Protect dq_callback() against simultaneous USB exchanges. Temporary buffer for USB exchanges added in the device struct. (all) Use a temporary buffer for all USB exchanges. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-14sms1xxx: fix compat for kernel 2.6.23 and earlierMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-13cx18: Suport external reset of the Z8F0811 IR controller on HVR-1600 for lircAndy Walls
From: Andy Walls <awalls@radix.net> cx18: added in cx18_ir_reset_gpio function for lirc_pvr150 like module. Also added the ability to reset the IR chip via ioctl like ivtv. This needs the mutex to protect gpio_dir and gpio_val in struct cx18 as gpio changes can come from a few different asynchronous sources now. Signed-off-by: Andy Walls <awalls@radix.net>
2008-07-13cx18: Add locking for struct cx18 GPIO state variablesAndy Walls
From: Andy Walls <awalls@radix.net> cx18: Add locking for struct cx18 GPIO state variables in anticpation of adding IR microcontroller reset support for use by external IR modules. Signed-off-by: Andy Walls <awalls@radix.net>
2008-07-12sms1xxx: fix missing #include <linux/types.h>Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Fix the build error: smscoreapi.c:689: error: 'uintptr_t' undeclared Thanks to Peter Schlaf for reporting this. Cc: Peter Schlaf <peter.schlaf@web.de> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-12merge: http://linuxtv.org/hg/~hgoede/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-12merge: http://linuxtv.org/hg/~mkrufky/sms1xxxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-12Update checkpatch.pl with the latest oneMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-12libv4l release 0.3.5hans@localhost.localdomain
From: Hans de Goede <j.w.r.degoede@hhs.nl> * Make JPEG decoding more robust Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
2008-07-12saa7134: fix compilationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Previous patch added a macro that it is not yet defined. Disable that part of the code for now. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-12saa7134: Add support for analog only ASUSTeK P7131Mauro Carvalho Chehab
From: Hermann Pitton <hermann-pitton@arcor.de> saa7134: add a separate entry for the ASUSTeK P7131 analog only and do some eeprom detection to escape from the TVFM35 with the same PCI subsystem on auto detection. Signed-off-by: Hermann Pitton <hermann-pitton@arcor.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-12merge: from v4l-dvbJean-Francois Moine
2008-07-12gspca: Conform to v4l2 spec and mutex unlock fix.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> gspca: Empty the application queues on streamoff ioctl. streamon/off and qbuf ioctls may be done by any application. Don't handle MJPEG pixel format as JPEG. (thanks to Hans de Goede) Authorize reqbufs ioctl when streaming. Bad mutex unlock in poll() when streaming problem. (thanks to Mauro Carvalho Chehab) Don't handle 'webcam disconnected' in stream off. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-11sms1xxx: fix improper usage of asm/foo.hMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Fix the following warnings generated by checkpatch.pl: WARNING: Use #include <linux/io.h> instead of <asm/io.h> 251: FILE: linux/drivers/media/dvb/siano/smscoreapi.c:30: +#include <asm/io.h> WARNING: Use #include <linux/scatterlist.h> instead of <asm/scatterlist.h> 1566: FILE: linux/drivers/media/dvb/siano/smscoreapi.h:29: +#include <asm/scatterlist.h> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-11merge: http://linuxtv.org/hg/~mkrufky/sms1xxxMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> This adds a new driver to the tree. Still needs a better review, since kmalloced vars are not properly initialized. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-11uvcvideo: Fix possible AB-BA deadlock with videodev_lock and open_mutexMauro Carvalho Chehab
From: Laurent Pinchart <laurent.pinchart@skynet.be> The uvcvideo driver's uvc_v4l2_open() method is called from videodev's video_open() function, which means it is called with the videodev_lock mutex held. uvc_v4l2_open() then takes uvc_driver.open_mutex to check dev->state and avoid racing against a device disconnect, which means that open_mutex must nest inside videodev_lock. However uvc_disconnect() takes the open_mutex around setting dev->state and also around putting its device reference. However, if uvc_disconnect() ends up dropping the last reference, it will call uvc_delete(), which calls into the videodev code to unregister its device, and this will end up taking videodev_lock. This opens a (unlikely in practice) window for an AB-BA deadlock and also causes a lockdep warning because of the lock misordering. Fortunately there is no apparent reason to hold open_mutex when doing kref_put() in uvc_disconnect(): if uvc_v4l2_open() runs before the state is set to UVC_DEV_DISCONNECTED, then it will take another reference to the device and kref_put() won't call uvc_delete; if uvc_v4l2_open() runs after the state is set, it will run before uvc_delete(), see the state, and return immediately -- uvc_delete() does uvc_unregister_video() (and hence video_unregister_device(), which is synchronized with videodev_lock) as its first thing, so there is no risk of use-after-free in uvc_v4l2_open(). Bug diagnosed based on a lockdep warning reported by Romano Giannetti <romano@dea.icai.upcomillas.es>. Signed-off-by: Roland Dreier <roland@digitalvampire.org> Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-10gspca: SN9C103 OV7630 fixes in sonixb.Jean-Francois Moine
From: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Andoni Zubimendi <andoni.zubimendi@gmail.com> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-10gspca: Add auto gain/exposure to sonixb and tas5110 / ov6650 sensors.Jean-Francois Moine
From: Hans de Goede <j.w.r.degoede@hhs.nl> sonixb: Do auto gain for tas5110 / ov6650 sensors. pac207: Move the auto_gain function to gspca. gspca: New function gspca_auto_gain_n_exposure(). Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-10merge...Jean-Francois Moine