summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2008-08-03gspca: Fix of "scheduling while atomic" crash.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The crash is due to USB exchanges done at interrupt level. These exchanges, tied to autogain, are now done by the application. Also, there is a fix about autogain start. Concerned subdrivers: etoms, pac7311, sonixj and spca561. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-08-01merge: v4l-dvbJean-Francois Moine
2008-08-01set mts_firmware for em2882 based Pinnacle Hybrid ProMauro Carvalho Chehab
From: Eugeniy Meshcheryakov <eugen@debian.org> Pinnacle Hybrid Pro (2304:0226) requires mts_firmware flag to have any sound. Without this flag it is useful only for watching silent movies. Signed-off-by: Eugeniy Meshcheryakov <eugen@debian.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-08-01gspca: Fix small bugs, simplify and cleanup ov519.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The hflip and vflip controls work for ov519 - ov7670 only. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-30merge: 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-30gspca: Bad bytesperlines of pixelformat in spca505/506/508 and vc023x.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-30gspca: Bad scan of frame in spca505/506/508.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Bug introduced in changeset 6de914aaad86. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-30gspca: Webcam 0c45:6143 in documentation.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-30gspca: Don't use CONFIG_VIDEO_ADV_DEBUG as a compile option.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> This option is changed to GSPCA_DEBUG and it is set by default in gspca.h. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-29libv4l: query buffer: indicate the mapping state of our (fake) buffer in the ↵hans@localhost.localdomain
flags From: Hans de Goede <j.w.r.degoede@hhs.nl> libv4l: query buffer: indicate the mapping state of our (fake) buffer in the flags Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
2008-07-29libv4l: proper accounting of mmap count of fake mmap buffershans@localhost.localdomain
From: Hans de Goede <j.w.r.degoede@hhs.nl> libv4l: proper accounting of mmap count of fake mmap buffers Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
2008-07-29libv4l: intercept get capabilites and report read capabilityhans@localhost.localdomain
From: Hans de Goede <j.w.r.degoede@hhs.nl> libv4l: intercept get capabilites and report read capability Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
2008-07-29libv4l: check capabilities for streaminghans@localhost.localdomain
From: Hans de Goede <j.w.r.degoede@hhs.nl> libv4l: check capabilities for streaming Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
2008-07-29libv4l: add pkg-config (.pc) files for easier detection if libv4l is availablehans@localhost.localdomain
From: Hans de Goede <j.w.r.degoede@hhs.nl> libv4l: add pkg-config (.pc) files for easier detection if libv4l is available Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl>
2008-07-29libv4l2: work around wrong REQUEST_BUFFERS ioctl return codehans@localhost.localdomain
From: Gregor Jasny <jasny@vidsoft.de> libv4l2: work around wrong REQUEST_BUFFERS ioctl return code Signed-off-by: Gregor Jasny <jasny@vidsoft.de> Signed-off-by: Hans de Goede <j.w.r.degoede@hhs.nl> Acked-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-29merge: v4l-dvbJean-Francois Moine
2008-07-29gspca: Set back the old values of Sonix sn9c120 and cleanup source.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The values from win traces do not seem to work while the webcams did work with gspca v1. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-29merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fixesMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-29tvmixer: remove obsolete semaphore headerHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-29fix vino driver build errorMauro Carvalho Chehab
From: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> The vino driver needs #include <media/v4l2-ioctl.h> drivers/media/video/vino.c: In function 'vino_ioctl': drivers/media/video/vino.c:4364: error: implicit declaration of function 'video_usercopy' make[3]: *** [drivers/media/video/vino.o] Error 1 Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-29merge: v4l-dvbJean-Francois Moine
2008-07-29gspca: hflip and vflip controls added for ov519 - ov7670 plus init cleanup.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The hflip and vflip controls work for ov7670 only. This bridge/sensor inverts blue and red - not fixed. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-28media/video/Kconfig: fix a typoMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Thanks to Hermann Gausterer for pointing this issue. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-28fix drivers/media/video/arv.c compilationMauro Carvalho Chehab
From: Adrian Bunk <bunk@kernel.org> This patch fixes the following compile errors: <-- snip --> ... CC [M] drivers/media/video/arv.o /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: In function 'ar_ioctl': /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:544: error: implicit declaration of function 'video_usercopy' /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c: At top level: /home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/media/video/arv.c:758: error: unknown field 'type' specified in initializer make[4]: *** [drivers/media/video/arv.o] Error 1 <-- snip --> Reported-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-28DVB_DRX397XD: remove FW_LOADER selectMauro Carvalho Chehab
From: Adrian Bunk <bunk@kernel.org> Also for the new DVB_DRX397XD driver the FW_LOADER select and the corresponding dependency on HOTPLUG can be removed. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-28merge: http://linuxtv.org/hg/~mkrufky/woodburyMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-28media/video/Kconfig: cosmetic changes and convert select into depends onMauro Carvalho Chehab
It seems cosmetically better to let USB drivers be the last one. Also, two SOC drivers were using select, instead of depends on SOC_CAMERA. Since select has some drawbacks when checking for dependencies, convert those two into depends on. From: Mauro Carvalho Chehab <mchehab@infradead.org> CC: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-28media/video/Kconfig: get rid of a selectMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-28gspca: Bad pixel format in the spca508 subdriver.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The pixel format should have been changed in changeset 6de914aaad86. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-28merge: v4l-dvbJean-Francois Moine
2008-07-28gspca: Change a bit the init of ov7660 and Sonix JPEG bridges.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Set back some values of gspcav1 in init of sonixj sensor ov7660. Add some comments. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-27mxl5007: Fix an error at include fileMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> mxl5007 was forcing for its compilation: In file included from drivers/media/common/tuners/mxl5007t.c:25:drivers/media/common/tuners/mxl5007t.h:80:1: warning: "CONFIG_MEDIA_TUNER_MXL5007T" redefined In file included from <command-line>:0: ./include/linux/autoconf.h:2782:1: warning: this is the location of the previous definition Probably, some temporary hack for testing. CC: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27pwc: Fix compilationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27au0828: add support for Hauppauge WoodburyMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-27au8522: add mechanism to configure IF frequency for vsb and qamMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Add a mechanism to configure IF frequency for vsb and qam. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-27merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvbMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27merge: 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-07-27em28xx: Rename #define for Compro VideoMate ForYou/StereoMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> There are two videomate boards supporded by em28xx. The names are almost identical. This patch renames one of such entries to something else. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27em28xx: AMD ATI TV Wonder HD 600 entry at cards struct is duplicatedMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Thanks to "Devin Heitmueller" <devin.heitmueller@gmail.com> for pointing this issue. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27em28xx: HVR-950 entry is duplicated.Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Thanks to "Devin Heitmueller" <devin.heitmueller@gmail.com> for pointing this issue. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27em28xx-cards: Add Compro VideoMate ForYou/Stereo modelMauro Carvalho Chehab
From: Vitaly Wool <vital@embeddedalley.com> Added Compro VideoMate ForYou/Stereo model (analog only) Signed-off-by: Vitaly Wool <vital@embeddedalley.com> [dougsland@gmail.com: Solved conflicts with v4l-dvb devel tree] Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com> [mchehab@infradead.org: Need to fix some merge conflicts] Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27saa7146: fix read from uninitialized memoryHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The offset field of the scatterlist entry *after* the last valid scatterlist entry was used instead of the first scatterlist entry (as was the intention of this code). This worked fine until the kzalloc of the sglist was replaced with kmalloc and sg_init_table only zeroed the exact needed length. Apparently kzalloc zeroes a bit more than is strictly necessary so the offset field was always 0 in the past. But now the offset field was suddenly random and this led to broken captures. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-27em28xx-cards: New supported IDs for analog modelsMauro Carvalho Chehab
From: Douglas Schilling Landgraf <dougsland@gmail.com> - New supported IDs for analog models (Based on Markus Rechberger <mrechberger@gmail.com> version of em28xx driver) - Validation field for new em28xx boards. Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com> [mchehab@infradead.org: Need to fix some merge conflicts] Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27gspca: probe/open race.Jean-Francois Moine
From: Oliver Neukum <oneukum@suse.de> The device is flagged present after it is registered. During that window calls to open() that should work fail with -ENODEV. Reversing the order fixes the race. Signed-off-by: Oliver Neukum <oneukum@suse.de> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-27em28xx-cards: Add GrabBeeX+ USB2800 modelMauro Carvalho Chehab
From: Aron Szabo <aron@aron.ws> Added GrabBeeX+ USB2800 model (analog only) Signed-off-by: Aron Szabo <aron@aron.ws> Signed-off-by: Douglas Schilling Landgraf <dougsland@gmail.com> [mchehab@infradead.org: Need to fix some merge conflicts] Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27backport commit d91958815d214ea365b98cbff6215383897edcb6Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: Matt LaPlante <kernel1@cyberdogtech.com> Date: Fri Jul 25 19:45:33 2008 -0700 Documentation cleanup: trivial misspelling, punctuation, and grammar corrections. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27backport commit 8d8bb39b9eba32dd70e87fd5ad5c5dd4ba118e06Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Author: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> Date: Fri Jul 25 19:44:49 2008 -0700 dma-mapping: add the device argument to dma_mapping_error() Add per-device dma_mapping_ops support for CONFIG_X86_64 as POWER architecture does: This enables us to cleanly fix the Calgary IOMMU issue that some devices are not behind the IOMMU (http://lkml.org/lkml/2008/5/8/423). I think that per-device dma_mapping_ops support would be also helpful for KVM people to support PCI passthrough but Andi thinks that this makes it difficult to support the PCI passthrough (see the above thread). So I CC'ed this to KVM camp. Comments are appreciated. A pointer to dma_mapping_ops to struct dev_archdata is added. If the pointer is non NULL, DMA operations in asm/dma-mapping.h use it. If it's NULL, the system-wide dma_ops pointer is used as before. If it's useful for KVM people, I plan to implement a mechanism to register a hook called when a new pci (or dma capable) device is created (it works with hot plugging). It enables IOMMUs to set up an appropriate dma_mapping_ops per device. The major obstacle is that dma_mapping_error doesn't take a pointer to the device unlike other DMA operations. So x86 can't have dma_mapping_ops per device. Note all the POWER IOMMUs use the same dma_mapping_error function so this is not a problem for POWER but x86 IOMMUs use different dma_mapping_error functions. The first patch adds the device argument to dma_mapping_error. The patch is trivial but large since it touches lots of drivers and dma-mapping.h in all the architecture. This patch: dma_mapping_error() doesn't take a pointer to the device unlike other DMA operations. So we can't have dma_mapping_ops per device. Note that POWER already has dma_mapping_ops per device but all the POWER IOMMUs use the same dma_mapping_error function. x86 IOMMUs use device argument. [akpm@linux-foundation.org: fix sge] [akpm@linux-foundation.org: fix svc_rdma] [akpm@linux-foundation.org: build fix] [akpm@linux-foundation.org: fix bnx2x] [akpm@linux-foundation.org: fix s2io] [akpm@linux-foundation.org: fix pasemi_mac] [akpm@linux-foundation.org: fix sdhci] [akpm@linux-foundation.org: build fix] [akpm@linux-foundation.org: fix sparc] [akpm@linux-foundation.org: fix ibmvscsi] Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27backport commit 27ac792ca0b0a1e7e65f20342260650516c95864Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Author: Andrea Righi <righi.andrea@gmail.com> Date: Wed Jul 23 21:28:13 2008 -0700 PAGE_ALIGN(): correctly handle 64-bit values on 32-bit architectures On 32-bit architectures PAGE_ALIGN() truncates 64-bit values to the 32-bit boundary. For example: u64 val = PAGE_ALIGN(size); always returns a value < 4GB even if size is greater than 4GB. The problem resides in PAGE_MASK definition (from include/asm-x86/page.h for example): #define PAGE_SHIFT 12 #define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) ... #define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK) The "~" is performed on a 32-bit value, so everything in "and" with PAGE_MASK greater than 4GB will be truncated to the 32-bit boundary. Using the ALIGN() macro seems to be the right way, because it uses typeof(addr) for the mask. Also move the PAGE_ALIGN() definitions out of include/asm-*/page.h in include/linux/mm.h. See also lkml discussion: http://lkml.org/lkml/2008/6/11/237 [akpm@linux-foundation.org: fix drivers/media/video/uvc/uvc_queue.c] [akpm@linux-foundation.org: fix v850] [akpm@linux-foundation.org: fix powerpc] [akpm@linux-foundation.org: fix arm] [akpm@linux-foundation.org: fix mips] [akpm@linux-foundation.org: fix drivers/media/video/pvrusb2/pvrusb2-dvb.c] [akpm@linux-foundation.org: fix drivers/mtd/maps/uclinux.c] [akpm@linux-foundation.org: fix powerpc] Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27remove select's of FW_LOADERMauro Carvalho Chehab
From: Adrian Bunk <bunk@kernel.org> After commit d9b19199e4894089456aaad295023263b5225c1a (always enable FW_LOADER unless EMBEDDED=y) we can remove the FW_LOADER select's and corresponding dependencies on HOTPLUG. Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27merge: http://linuxtv.org/hg/~mkrufky/mxl5007tMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>