summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-07-01merge: http://linuxtv.org/hg/~jfrancois/gspca/Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-30merge...Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-06-30gspca: minor changesJean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> main: V4L2_PIX_FMT_SPCA501 is compressed (thanks to Hans de Goede) main: return 0 when no change on vidioc_s_fmt_cap (thanks to Hans de Goede) pac207: cleanup Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-06-30gspca: all subdriversJean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> - remaning subdrivers added - remove the decoding helper and some specific frame decodings Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-06-29Avermedia E506 compositeMauro Carvalho Chehab
From: Tim Farrington <timf@iinet.net.au> Composite was originally mis-labelled as name_comp1, so it should be simply redone as name_comp, with its now corrected attributes. Signed-off-by: Tim Farrington <timf@iinet.net.au> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29merge: http://linuxtv.org/hg/~mkrufky/cxusbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29Fix whitespace diffs between -git and mercurialMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29README.patches Add a new practice accepted on kernelMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> On Jun 3, kernel commit adbd5886da5f467148b26cca3728ab0e672b3fcc added a new rule to help patch merging from maintainers, at Documentation/SubmittingPatches: "If you are a subsystem or branch maintainer, sometimes you need to slightly modify patches you receive in order to merge them, because the code is not exactly the same in your tree and the submitters'. If you stick strictly to rule (c), you should ask the submitter to rediff, but this is a totally counter-productive waste of time and energy. Rule (b) allows you to adjust the code, but then it is very impolite to change one submitter's code and make him endorse your bugs. To solve this problem, it is recommended that you add a line between the last Signed-off-by header and yours, indicating the nature of your changes. While there is nothing mandatory about this, it seems like prepending the description with your mail and/or name, all enclosed in square brackets, is noticeable enough to make it obvious that you are responsible for last-minute changes. Example : Signed-off-by: Random J Developer <random@developer.example.org> [lucky@maintainer.example.org: struct foo moved from foo.c to foo.h] Signed-off-by: Lucky K Maintainer <lucky@maintainer.example.org> This practise is particularly helpful if you maintain a stable branch and want at the same time to credit the author, track changes, merge the fix, and protect the submitter from complaints. Note that under no circumstances can you change the author's identity (the From header), as it is the one which appears in the changelog." This patch adds a quick description at this rule under README.patches. This is particularly important when merging mercurial tree with -git one. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29Fix compilation for mt9v022Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29ttpci: tda827x.h is at drivers/media/commonMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> As reported by Stephen Rothwell <sfr@canb.auug.org.au>: drivers/media/dvb/ttpci/budget-ci.c:50:21: error: tda827x.h: No such file or directory Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-29em28xx-dvb: Fix in-kernel compilationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Fix s2255drv compilation against older kernelsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> As reported by Hermann Pitton: CC [M] /mnt/xfer/mercurial/v4l-dvb-head/v4l-dvb/v4l/s2255drv.o s2255drv.c: In function 'vidioc_querycap': s2255drv.c:809: error: implicit declaration of function 'dev_name' s2255drv.c:809: warning: passing argument 2 of 'strlcpy' makes pointer from integer without a cast Tested with kernel 2.6.25.6 Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Fix callback namesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Callback naming has changed. Fix to the proper convention. CC: Dean Anderson <dean@sensoray.com> CC: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Fix hghead to avoid adding bogus SOB'sMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> As reported by Michael Krufky: > sms1xxx: fix Siano board names > > From: Michael Krufky <mkrufky@linuxtv.org> > > Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> > Signed-off-by: <> > > > I have to "hg export tip > file && nano file {remove last line} && hg rollback && hg revert --all && hg import file" to fix it. > > What went wrong? :-/ Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Fix compat with older kernelsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28cxusb: add initial support for AVerTVHD VolarMichael Krufky
From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Add initial support for this device. The AGC and tracking filter settings for the mxl5003 are known to be wrong, but it generally works. Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-27lgdt330x: add additional FEC control configuration optionMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Allow the following configuration, by passing clock_polarity_flip = 2: Enable FEC automatic reset. Disable spectrum inversion. Enable viterbi resynchronization. Set polarity indicator high. Enable error flag insertion. Thanks to Daniel Gimpelevich, for discovering that this configuration is used on the AVerMedia AVerTVHD Volar. Cc: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-27saa7134-empress: fix MPEG control supportHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The MPEG controls could not be enumerated and so could not be read or set through the v4l2-ctl utility or shown in control panels. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-30From: Laurent Pinchart <laurent.pinchart@skynet.be>Mauro Carvalho Chehab
USB Video Class driver This driver supports video input devices compliant with the USB Video Class specification. This means lots of currently manufactured webcams, and probably most of the future ones. Signed-off-by: Laurent Pinchart <laurent.pinchart@skynet.be> Notice: Due to MAINTAINERS file that isn't at mercurial tree, I've committed it on my -git and backported to -hg. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-27Added the SBGGR16 format and fixed two memory leaks on pixfmt-test.Mauro Carvalho Chehab
From: Michael Schimek <mschimek@gmx.at> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-27merge: http://linuxtv.org/hg/~dougsland/cx23885-417Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-27Improves commit message scriptsMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> This patch improves message description sanity rules: - mailimport now prefers to edit using editdiff. This helps to fix trivial CodingStyle errors at receive patches; - hghead.pl will now remove blank whitespaces if no body exists; - "make commit" will now run hghead.pl. This will do some sanity checks at commit messages: *) Will warrant that "from:" metatag exists, avoiding to have patches without proper authorship id at someone's else tree; *) Will order the tags at the expected way (subject, from, body, signatures); *) Will warrant that one and just one blank line exists between each of the four parts of the commit message. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-27Fix a few bugs at the scriptMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-27saa7134: Avermedia A16D composite inputMauro Carvalho Chehab
From: Dan Taylor <dtaylor@startrac.com> Signed-off-by: Star Trac by Unisen, Inc. Dan Taylor <dtaylor@startrac.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-27cx23885-417: Replace cx23885_do_ioctl to use video_ioctl2Douglas Schilling Landgraf
From: Douglas Schilling Landgraf <dougsland@gmail.com> Convert cx23885-417 to use video_ioctl2 Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-06-25videodev: allow PRIVATE_BASE controls when called through VIDIOC_G/S_CTRL.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> V4L2_CID_PRIVATE_BASE controls are not allowed when called from VIDIOC_S/G_EXT_CTRL as extended controls use a better mechanism for private controls. But still allow it when called from the VIDIOC_G/S_CTRL to extended control conversion in video_ioctl2() for backwards compatibility. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-25Merge: from http://linuxtv.org/hg/~awalls/v4l-dvbHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-25ivtv/cx18: remove s/g_ctrl, now all controls are handled through s/g_ext_ctrlHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> videodev converts old-style controls to an extended control so the ivtv and cx18 drivers no longer have to handle both. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-25videodev: improve extended control support in video_ioctl2()Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - add sanity checks for the extended controls argument. - if the driver only supports extended controls, then convert old-style controls to an extended control callback. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-25ivtv/cx18: fix compile error when CONFIG_VIDEO_ADV_DEBUG is not defined.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Thanks to Randy Dunlap for reporting this. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-24cx18: Improve Raptor card audio input routing defintionsAndy Walls
From: Andy Walls <awalls@radix.net> cx18: Improved Raptor card audio input routing defintions, so that muxer values matched cx18_gpio() values for tuner, line in 1, and radio and added LED indication of selected audio input. Audio line in 2 doesn't work as it uses the not yet supported 2nd I2S port. Tuner/FM Radio AF is mono until SIF support is fixed. Signed-off-by: Andy Walls <awalls@radix.net>
2008-06-23bttv: allow debug ioctl'sMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22Add a new meta-tag to hghead.plMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22 Fix open/close race in saa7134Mauro Carvalho Chehab
From: Arjan van de Ven <arjan@linux.intel.com> The saa7134 driver uses a (non-atomic) variable in an attempt to only allow one opener of the device (how it deals with sending the fd over unix sockets I don't know). Unfortunately, the release function first decrements this variable, and THEN goes on to disable more of the device. This allows for a race where another opener of the device comes in after the decrement of the variable, configures the hardware just to then see the hardware be disabled by the rest of the release function. This patch makes the release function use the same lock as the open function to protect the hardware as well as the variable (which now at least has some locking to protect it). Signed-off-by: Arjan van de Ven <arjan@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22xc2028 unaligned access fixesMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22WRITE_RPS1() converts to le32 itselfMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> ... but two ancient drivers had not noticed. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22zoran annotations and fixesMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22cx23885 endianness fixesMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22bt8xx endianness annotations and fixesMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22dmx_write: memcpy from user-supplied pointerMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> ... copy to kernel memory first Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22split dvb_ringbuffer dual-use functionsMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> split the suckers into kernel-memory and user-memory versions, annotate both properly. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22pluto_set_dma_addr() fixMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> bogus cpu_to_le32() when passing dma address to hardware via writel() - writel() converts itself. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22saa7146: ->cpu_addr and friends are little-endianMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> Annotations + stop saa7146_i2c from playing fast and loose with reuse of ->cpu_addr for host-endian. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Fix subject identificationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22net endianness fixMauro Carvalho Chehab
From: Al Viro <viro@ftp.linux.org.uk> According to RFC 4326 (4.1) D-bit is MSB in net-endian 16bit. dvb_net.c did /* Set D-bit for CRC32 verification, * if it was set originally. */ ulen |= 0x0080; which works of little-endian (htons(1<<15) is 0x0080 there), but breaks on big-endian. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-26This driver adds support for the Sensoray 2255 devices.Mauro Carvalho Chehab
From: Dean Anderson <dean@sensoray.com> It was primarily developed by Dean Anderson with only a little bit of guidance and cleanup by Greg. Signed-off-by: Dean Anderson <dean@sensoray.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Add LifeVideo To-Go Cardbus PCI IDMauro Carvalho Chehab
From: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Signed-off-by: Daniel Gimpelevich <daniel@gimpelevich.san-francisco.ca.us> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-28Add support for em2860 based PointNix Intra-Oral CameraMauro Carvalho Chehab
From: Devin Heitmueller <devin.heitmueller@gmail.com> em28xx-cards.c em28xx-input.c em28xx-video.c em28xx.h - Add support for the PointNix Intra-Oral Camera, which required addition of a construct for reading the "snapshot" button (provided on the em2860 and em2880 chips, but this is the first case where I have seen it actually used in a product). The button is wired to pin 56 on the em2880. http://www.pointnix.com/ENG/dental/product_02.asp Thanks to Roberto Mantovani <rmantovani@libero.it> for testing the changes Signed-off-by: Devin Heitmueller <devin.heitmueller@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-06-22cx18: improve support for the Raptor board.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> - add radio definition - reset the audio firmware (required for this board, harmless for the others) Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-06-22ivtv/cx18: improve tuner std check in card definitions.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>