summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2007-10-17backport changeset 13bcd5d0e21e3ca726965371ada8ff6c64af288fMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original description: Author: Al Viro <viro@ftp.linux.org.uk> Date: Sat Oct 13 08:25:24 2007 +0100 v4l: copy_to_user() is not a good method name Breaks on any target that has copy_to_user() defined as a non-trivial macro. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-17backport changeset c1017a4cdb68ae5368fbc9ee42c77f1f5dca8916Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original description: Author: Jaroslav Kysela <perex@perex.cz> Date: Mon Oct 15 09:50:19 2007 +0200 [ALSA] Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-17Make it backward compatible with kernels <2.6.24Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-17backport changeset 3be27d37c257fa5f99363f9c8e06e405cbad712eMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original description: i2c: Remove NOP i2c_algorithm.algo_control() methods This removes NOP implementations of i2c_algorithm.algo_control. With this change, there are no implementations of this hook in the kernel.org tree ... that hook seems about ripe to remove. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-17backport changeset 3b04ddde02cf1b6f14f2697da5c20eca5715017fMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original description: [NET]: Move hardware header operations out of netdevice. Since hardware header operations are part of the protocol class not the device instance, make them into a separate object and save memory. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-17backport changeset 7e7654a92a5a75a350cc3458389bc76273498f6aMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Original description: cdev: remove unneeded setting of cdev names struct cdev does not need the kobject name to be set, as it is never used. This patch fixes up the few places it is set. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-17merge: http://linuxtv.org/hg/~tap/kernel-syncMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-16Backport kernel commit c818e0a152bcb138411b07f4495b8e6fb9bacf52Clemens Ladisch
ALSA HG commit 5401 Date: Mon, 17 Sep 2007 07:33:37 +0000 (+0200) [ALSA] bt87x: fix detection of generic boards Add an 'unknown' board type so that it is possible to differentiate between unknown and generic boards. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2007-10-16Backport kernel commit 950fb626dc28e17ae4ad01dba07957bdc6e0b997Trent Piepho
ALSA HG commit 5374 Date: Fri, 7 Sep 2007 11:18:50 +0000 (+0200) [ALSA] snd-bt87x: Power down audio ADC when not in use Sets a bit to power down the Bt87x's internal audio ADC when the ALSA device isn't open, or when it is in 'digital mode' using an external ADC. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2007-10-16Backport kernel commit dcfb4140328eed2d73797f278786eb99efd9f41cTrent Piepho
kernel-sync: ALSA HG commit 5370 Date: Thu, 6 Sep 2007 13:06:44 +0000 (+0200) [ALSA] snd-bt87x: Improve support for different board types Different cards have different audio configurations, but the driver didn't support this. The only setting it had was the digital rate. This patch adds a board configuration list. Currently, configurable items are the digital rate and the digital data format (for cards with an external ADC), a flag for the absence of an external ADC, and a flag for no connection to the Bt87x internal ADC. This allows cards that don't use the internal ADC to omit the ALSA 'Bt87x analog' device and related controls. Cards without an external ADC can omit the 'Bt87x digital' device. In order to support the CS5331A ADC used on the Osprey 440 and 2x0 cards, the digital format needs to be different than the default. Support could be added for defining: The connections or lack of them to the Bt87x's internal ADC mux Multiple sample rates for an external ADC (e.g. Osprey) Control of an external mux for an external ADC (e.g. Osprey) The card definitions for cards other than the Ospreys are kept equivalent to their old values. This is likely inaccurate for most cards, as it is doubtful that both an external and the internal ADC would be used. Lacking information on those cards, the behavior is left unchanged. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2007-10-16Backport kernel commit abaeeb59c94b6efc368f5058009c1d82ce031abdClemens Ladisch
kernel-sync: ALSA HG commit 5313 Date: Wed, 22 Aug 2007 12:19:45 +0000 (+0200) [ALSA] bt87x - Add known PCI ID entries Added the PCI ID entries for known working devices - Prolink PixelView PV-M4900 - Pinnacle Studio PCTV rave Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2007-10-16Backport kernel commit 918f3a0e8cf67b5db966516f255eaf24d814fac0Clemens Ladisch
kernel-sync: ALSA HG commit 5279 Date: Mon, 13 Aug 2007 15:40:54 +0000 (+0200) [ALSA] pcm: add snd_pcm_rate_to_rate_bit() helper Add a snd_pcm_rate_to_rate_bit() function to factor out common code used by several drivers. Signed-off-by: Clemens Ladisch <clemens@ladisch.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2007-10-16Backport kernel commit a5ce88909d3007caa7b65996a8f6784350beb2a6Takashi Iwai
kernel-sync: ALSA HG commit 5194 Date: Mon, 23 Jul 2007 13:42:26 +0000 (+0200) Clean up with common snd_ctl_boolean_*_info callbacks Clean up codes using the new common snd_ctl_boolean_*_info() callbacks. Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
2007-10-16Backport kernel commit 64b33619a30ff18c1535ee779572ecffcc4711d2Al Viro
kernel-sync: Date: Sun, 14 Oct 2007 18:35:20 +0000 (+0100) long vs. unsigned long - low-hanging fruits in drivers deal with signedness of the stuff passed to set_bit() et.al. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2007-10-16"while (!ca->wakeup)" breaks the CAM initialisationMauro Carvalho Chehab
From: Marco Schluessler <marco@lordzodiac.de> Signed-off-by: Marco Schluessler <marco@lordzodiac.de> Signed-off-by: Oliver Endriss <o.endriss@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-16partially revert changeset a6db576db177Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Accidentally, VIRT_TO_BUS were removed by a previous changeset. Reverting it. This patch should be merged with changeset 6320:a6db576db177 at -git. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-15compat: fix syntax mistake in compat.hTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> A previous patch forgot the "define" in #define and so won't even compile when the code was triggered (kernel < 2.6.13). Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-10-15build: Deal with VIRT_TO_BUSTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> This Kconfig option was added in 2.6.23. On older kernels, use !PPC64 to set it. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-10-15ir-kbd-i2c: Missing break statementTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Someone added a new case without adding a break to the one before it. Thanks to Margus <b-berski at mbox200 dot swipnet dot se> for spotting this. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-10-15build: Let kernel directory be specified by setting KDIRTrent Piepho
From: Trent Piepho <xyzzy@speakeasy.org> Will compare KDIR to SRCDIR and if not equal regenerate .version from the kernel specified in KDIR. The regeneration of .version is forced by making it a .PHONY rule. It was necessary to redo the way the release and .version targets worked. The new way avoids the duplication of code that existed before. The release target doesn't do anything. If release is specified as a goal, then .version regeration is forced (via .PHONY). Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
2007-10-15 V4L: possible leak in em28xx_init_isocMauro Carvalho Chehab
From: Florin Malita <fmalita@gmail.com> Coverity (CID 1929) spotted the following: if a transfer buffer allocation fails, the last allocated urb is leaked (it hasn't been stored in dev->urb[] yet so em28xx_uninit_isoc misses it). The patch also includes a small typo fix. Signed-off-by: Florin Malita <fmalita@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-15merge: http://www.linuxtv.org/hg/~hverkuil/ivtvMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-15merge http://linuxtv.org/hg/~tap/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-14pvrusb2: Fix broken build for 2.6.18 kernelMike Isely
From: Mike Isely <isely@pobox.com> Earlier changes to move away from use of struct class_device introduced breakage for kernels older than 2.6.19. This change at least allows it to build again for 2.6.18. Still unclear about older kernels, unfortunately :-( Signed-off-by: Mike Isely <isely@pobox.com>
2007-10-14pvrusb2: Improve encoder chip health trackingMike Isely
From: Mike Isely <isely@pobox.com> This is a minor change to help with tracking the viability of the encoder chip within the PVR USB2 device. Signed-off-by: Mike Isely <isely@pobox.com>
2007-10-14ivtv: undo video mute when closing the radio.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-14ivtv: fix video mute when radio is usedHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> When the radio is active the video should be muted when a capture starts. However, this was done at the wrong time and the mute settings were overwritten when cx2341x_update was called. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-14ivtvfb: YUV output size fix when ivtvfb is not loaded.Hans Verkuil
From: Ian Armstrong <ian@iarmst.demon.co.uk> If the ivtvfb module isn't loaded, the valid YUV output area should be set to full-screen. This patch fixes the case where the valid output area was not reset when the output broadcast format was changed from NTSC to PAL. This resulted in output being limited to the top 480 lines of the display. Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-14ivtvfb: YUV handling of an image which is not visible in the display area.Hans Verkuil
From: Ian Armstrong <ian@iarmst.demon.co.uk> When the ivtvfb module is loaded, the YUV output is relative to the framebuffer output. When a virtual screen size is used, the output area for the YUV may actually be off screen. To prevent the hardware from crashing, the current driver will ignore an off-screen position and leave the output visible at the last on-screen position. This may not be desirable, so this patch will switch off the YUV output should the image move off-screen, and re-enable it should the image move on-screen again. Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-14v4l2-ctl: fix usage message.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-14ivtvfb: check return value of unregister_framebuffer.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Prevent unloading the framebuffer if it is still in use. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-13ivtv: fix circular locking (bug 9037)Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> If you try to access the video device from within an udev rule, then you get into a circular locking situation. Changed the driver to postpone the registration of the devices until everything else has been fully initialized, so that the newly created device can be used immediately. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-13 V4L: saa7134: Fix interaction between tvaudio thread and the freezerMauro Carvalho Chehab
From: Maxim Levitsky <maximlevitsky@gmail.com> make tvaudio thread freezeable, and add proper support for that Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-12ivtv: fix resizing MPEG1 streamsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Resizing an MPEG 1 stream would cut off the right half of the image due to a missing divide by 2 in VIDIOC_S_FMT. Also did some minor cleanup in this part of the code. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-12ivtvfb: screen mode change sometimes goes wrong.Hans Verkuil
From: Ian Armstrong <ian@iarmst.demon.co.uk> This patch partially reverts a previous change that caused the CX2341X_OSD_SET_PIXEL_FORMAT firmware calls to be skipped when the pixel format of the framebuffer wasn't altered by FBIOPUT_VSCREENINFO. Unfortunately, another firmware call on the PVR350 sometimes scrambles the display when trying to adjust the framebuffer settings. This patch re-enables the CX2341X_OSD_SET_PIXEL_FORMAT calls to try and prevent this from occurring. Signed-off-by: Ian Armstrong <ian@iarmst.demon.co.uk> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-12ivtv: set the video color to black instead of green when capturing from the ↵Hans Verkuil
radio. From: Hans Verkuil <hverkuil@xs4all.nl> Thanks-to: Martin Dauskardt <md001@gmx.de> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-12ivtv: fix incorrect EBUSY return.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Trying to open the radio when a capture is in progress will make it impossible to open the radio again since the radio stream wasn't released. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-12 Additional Fixes for saa7134 suspend/resumeMauro Carvalho Chehab
From: Maxim Levitsky <maximlevitsky@gmail.com> Fixes few more problems I found in my saa7134 resume code: * Race between IRQ handler and .suspend()/.resume() functions * Removes timeout timers on active buffers - those buffers will be recaptured after resume * Adds suspend/resume for IR code - probably necessary if using polling mode * Adds #ifdef CONFIG_PM overs suspend code * Runs a quirk in set_tvnorm in suspend/resume too * Rearranges the order of calls in saa7134_resume to be exactly as in saa7134_initdev thus the card is initialized in exactly the same way * Since DMA audio capture suspend/resume isn't yet supported, avoid re-enabling it on resume for now Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-14 ivtv: fix NULL dereferenceMauro Carvalho Chehab
From: Adrian Bunk <bunk@kernel.org> We shouldn't dereference "itv" when we know it's NULL... Spotted by the Coverity checker. Signed-off-by: Adrian Bunk <bunk@kernel.org> Reviewed-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-15merge: http://linuxtv.org/hg/~mkrufky/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-14tuner-core.c: fe_has_signal() can return uninitialized valueMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Initialize strength to zero. Thanks to Adrian Bunk, who spotted this with the Coverity checker. Cc: Adrian Bunk <bunk@kernel.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2007-10-13 Double-free in cx23885_initdevMauro Carvalho Chehab
From: Florin Malita <fmalita@gmail.com> Both cx23885_initdev and cx23885_dev_setup free the device in their error path so a failure in the latter causes a double-free. Since cx23885_dev_setup is only called from cx23885_initdev, it should be safe to remove its deallocation and leave the cleanup up to the allocating function. Coverity CID 1922. Signed-off-by: Florin Malita <fmalita@gmail.com> CC: Steven Toth <stoth@hauppauge.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-13 fix videobuf_cgmbuf exportMauro Carvalho Chehab
From: Pekka Enberg <penberg@cs.helsinki.fi> As videobuf_cgmbuf is defined only if CONFIG_VIDEO_V4L1_COMPAT is enabled, move the EXPORT_SYMBOL_GPL declaration inside the #ifdef block. Fixes compilation for x86_64 defconfig. Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> CC: Ingo Molnar <mingo@elte.hu> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-15 V4L: cinergyT2, remove bad usage of ERESTARTSYSMauro Carvalho Chehab
From: Jiri Slaby <jirislaby@gmail.com> cinergyT2, remove bad usage of ERESTARTSYS test of cinergyt2->disconnect_pending doesn't ensure pending signal and so ERESTARTSYS would reach userspace, which is not permitted. Change it to EAGAIN Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-15merge: http://www.linuxtv.org/hg/~hverkuil/mpegcompMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-15v4l core: remove the unused .hardware V4L1 fieldMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> struct video_device used to define a .hardware field. While initialized on severl drivers, this field is never used inside V4L. However, drivers using it need to include the old V4L1 header. This seems to cause compilation troubles with some random configs. Better just to remove it from all drivers. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-15radio-gemtek: fix 'VID_HARDWARE_GEMTEK' undeclaredMauro Carvalho Chehab
From: Pekka Seppänen <pexu@kapsi.fi> Remove obsolete V4L v1 reference. Thanks to Ingo Molnar for pointing this issue. Signed-off-by: Pekka Seppänen <pexu@kapsi.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-11 cx23885: Drop empty i2c algorithm control callbackMauro Carvalho Chehab
From: Jean Delvare <khali@linux-fr.org> i2c_algorithm.algo_control no longer exists. Signed-off-by: Jean Delvare <khali@linux-fr.org> Reviewed-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2007-10-11Remove obsolete VIDIOC_S/G_MPEGCOMP ioctlsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Remove the obsolete VIDIOC_G_MPEGCOMP and VIDIOC_S_MPEGCOMP ioctls from the V4L2 API as per the removal schedule (October 2007). Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2007-10-11 git-dvb: rename videobuf_qtype_ops.copy_to_user()Mauro Carvalho Chehab
From: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>