summaryrefslogtreecommitdiff
path: root/linux/drivers/media
AgeCommit message (Collapse)Author
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-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 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>
2008-07-27merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-videodevMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27videodev2: Fix merge conflictMauro 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/~mkrufky/hvr19x0Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-empressMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-27s2255drv: add missing headerHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-27gspca: Webcams with Sonix bridge and sensor ov7630 are VGA.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> This fixes a bug introduced in c503a6f8332a (thanks to Hans de Goede). Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-26pvrusb2: fix device descriptions for HVR-1900 & HVR-1950Michael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Acked-By: Mike Isely <isely@pobox.com>
2008-07-26mxl5007t: remove excessive locksMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> The use of mutex locking is overly paranoid in this driver. The only locks we need are around the manipulation of the register arrays. The other locks are not needed - remove them. Thanks to Steven Toth for pointing this out. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-26gspca: Bad webcam information in some modules since 28b8203a830e.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-26gspca: Set the specific per webcam information in driver_info for sonixb.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-26mxl5007t: move i2c gate handling outside of mutex protected code blocksMichael Krufky
From: Michael Krufky <mkrufky@linuxtv.org> There is no reason to protect the i2c gate handling within the mxl5007t state mutex. Thanks to Steven Toth for pointing this out. Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
2008-07-26saa7146: fix VIDIOC_ENUM_FMTHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> VIDIOC_ENUM_FMT should keep the index and type fields. Instead, type was zeroed. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-26empress: fix control handling oopsHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-26saa7134-empress.c: fix deadlockHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> ts_release() locked a mutex that videobuf_stop() also tried to obtain. But ts_release() shouldn't hold that mutex at all. Make empress_users atomic as well to prevent possible race condition. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-26fix a few assorted spelling mistakes.Hans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-26v4l2-dev: remove unused type and type2 field from video_deviceHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The type and type2 fields were unused and so could be removed. Instead add a vfl_type field that contains the type of the video device. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-26gspca: Remove the remaining frame decoding functions from the subdrivers.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> SPCA505 and SPCA508 added in the pixel formats. Decode functions and associated resources removed in spca505, 506 and 508. The decode routines are now found in the V4L library. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-26gspca: Bad sensor for some webcams in zc3xx since 28b8203a830e.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> '.driver_info = ' forgotten in usb device id table. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-26merge: v4l-dvbJean-Francois Moine
2008-07-26gspca: Webcam 0c45:6143 added in sonixj.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> It is an other Pccam168. The .inf says SN9C120B + SP80708, but it should work as SN9C120 + MI0360. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-25merge: v4l-dvbJean-Francois Moine
2008-07-25gspca: Set the specific per webcam information in driver_info.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> This patch removes a big part of the code run at probe time. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-25videodev: remove some CONFIG_VIDEO_V4L1_COMPAT code from v4l2-dev.hHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> The video_device_create_file and video_device_remove_file functions can be removed from v4l2-dev.h, removing the dependency on videodev.h in v4l2-dev.h. Also removed a few more videodev.h includes that should have been videodev2.h. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-25videodev: replace videodev.h includes by videodev2.h where possibleHans Verkuil
From: Hans Verkuil <hverkuil@xs4all.nl> Several V4L2 drivers still included videodev.h. Fix this. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-25v4l-dvb: remove broken PlanB driverHans Verkuil
From: Adrian Bunk <bunk@kernel.org> The PlanB driver has been broken since around May 2004. No one stepped in to maintain it, so it is now being removed. Signed-off-by: Adrian Bunk <bunk@kernel.org> Acked-by: Hans Verkuil <hverkuil@xs4all.nl> Acked-by: Michel Lanners <mlan@cpu.lu> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
2008-07-24This patch fixes some kernel version checks.Mauro Carvalho Chehab
From: Reinhard Schwab <reinhard.schwab@aon.at> Signed-off-by: Reinhard Schwab <reinhard.schwab@aon.at> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-24dw2102: fix in-kernel compilationMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-24make cpia2 and vicam backward compatibleMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Probably, this is a bit overkill, but let's keep the old behavior for kernels lower than 2.6.27, until we make sure that those changes work fine also for older kernels. kernel-sync: since we don't want this patch to go to kernel Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-24backport commit c466774636b3cc43c2c304b44e52974d9d53f3e0Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Author: David Woodhouse <dwmw2@infradead.org> Date: Mon Jun 23 11:41:04 2008 +0100 dabusb: use request_firmware() Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-24backport request_firmware changesets for vicam and cpia2_coreMauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Backport changeset 04a33e406a062cd1bb55014ee17a3558109a2d74 Author: David Woodhouse <dwmw2@infradead.org> Date: Mon Jun 23 11:36:23 2008 +0100 cpia2: use request_firmware() Thanks for Jaswinder Singh for converting the firmware blob itself to ihex. Backport changeset fb54be8755d386008bfadb7fc8ff89451fa3a9c9 Author: Jaswinder Singh <jaswinder@infradead.org> Date: Fri Jun 27 19:50:40 2008 +0530 vicam: use request_firmware() Although it wasn't actually using ihex records before, we use the Intel HEX record format for this firmware -- because that gives us a simple way to split it into separate chunks internally as we need, without loading each part as a separate file. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-24backport commit 0a2a736afa91e8a0402c9dbdaf2ee28481a50bd3Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> kernel-sync: Author: David Woodhouse <dwmw2@infradead.org> Date: Thu May 29 19:50:06 2008 +0300 ttusb-budget: use request_firmware() This patch will keep using the enclosed .h firmware for out-of-kernel compilations. For in-kernel compilation, it will use the firmware on a .bin file that is linkedited together with dvb-ttusb-budget target. On both cases, the firmware will be inside dvb-ttusb-budget.ko module. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-24backport commit b9e40857682ecfc5bcd0356a23ff409883ffb982Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: David S. Miller <davem@davemloft.net> Date: Tue Jul 15 00:15:08 2008 -0700 netdev: Do not use TX lock to protect address lists. Now that we have a specific lock to protect the network device unicast and multicast lists, remove extraneous grabs of the TX lock in cases where the code only needs address list protection. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-24backport commit e282959ef3ebae0d72ac0b24242c376fa34da585Mauro Carvalho Chehab
From: Mauro Carvalho Chehab <mchehab@infradead.org> Author: Greg Kroah-Hartman <gregkh@suse.de> Date: Wed May 21 12:52:33 2008 -0700 device create: dvb: convert device_create to device_create_drvdata device_create() is race-prone, so use the race-free device_create_drvdata() instead as device_create() is going away. kernel-sync: Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
2008-07-23gspca: Do not use the driver_info field of usb_device_id.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> The field driver_info will be used to handle the specific per webcam information. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>
2008-07-23gspca: Get the card name of QUERYCAP from the usb product name.Jean-Francois Moine
From: Jean-Francois Moine <moinejf@free.fr> This is a preliminary for using the driver_info of the struct usb_device_id to handle the specific per webcam information. Signed-off-by: Jean-Francois Moine <moinejf@free.fr>