Linus Torvalds aace99e57c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media ...

Pull media fixes from Mauro Carvalho Chehab.

Trivial conflict due to new USB HID ID's being added next to each other
(Baanto vs Axentia).

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
  [media] smia: Fix compile failures
  [media]  Fix VIDIOC_DQEVENT docbook entry
  [media] s5p-fimc: Fix control creation function
  [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
  [media] s5p-mfc: Fix setting controls
  [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
  [media] v4l/s5p-mfc: corrected encoder v4l control definitions
  [media] v4l: mem2mem_testdev: Fix race conditions in driver
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] cxd2820r: Fix an incorrect modulation type bitmask
  [media] em28xx: Show a warning if the board does not support remote controls
  [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
  [media] USB: Staging: media: lirc: initialize spinlocks before usage
  [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
  [media] bw-qcam: driver and pixfmt documentation fixes
  [media] cx88: fix firmware load on big-endian systems
  [media] cx18: support big-endian systems
  [media] ivtv: fix support for big-endian systems
  [media] tuner-core: return the frequency range of the correct tuner
  [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
  ...

2012-06-25 14:53:09 -07:00

..

au0828

[media] au0828: Add USB ID used by many dongles

2012-05-20 10:30:31 -03:00

blackfin

[media] v4l2-dev: add flag to have the core lock all file operations

2012-05-14 09:19:38 -03:00

bt8xx

[media] bttv: The Hauppauge 61334 needs the msp3410 to do radio demodulation

2012-06-11 16:05:32 -03:00

cpia2

[media] v4l2-dev: add flag to have the core lock all file operations

2012-05-14 09:19:38 -03:00

cx18

[media] cx18: support big-endian systems

2012-06-11 18:13:57 -03:00

cx88

[media] cx88: fix firmware load on big-endian systems

2012-06-11 18:14:08 -03:00

cx231xx

[media] cx231xx: replace open-coded ARRAY_SIZE with macro

2012-05-15 11:41:13 -03:00

cx23885

[media] cx23885: TeVii s471 card support

2012-05-20 11:09:26 -03:00

cx25821

[media] v4l: fix compiler warnings

2012-05-14 14:49:38 -03:00

cx25840

[media] v4l: fix compiler warnings

2012-05-14 14:47:03 -03:00

davinci

[media] media/video: add I2C dependencies

2012-05-15 07:53:23 -03:00

em28xx

[media] em28xx: Show a warning if the board does not support remote controls

2012-06-18 11:25:20 -03:00

gspca

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-06-25 14:53:09 -07:00

hdpvr

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

2012-05-24 10:21:51 -07:00

ivtv

[media] ivtv: fix support for big-endian systems

2012-06-11 18:13:27 -03:00

m5mols

[media] m5mols: Add 3A lock control

2012-05-14 14:35:04 -03:00

marvell-ccic

[media] V4L: marvell-ccic: (cosmetic) remove redundant variable assignment

2012-05-15 08:52:03 -03:00

omap

[media] omap_vout: fix section mismatch

2012-01-23 15:27:17 -02:00

omap3isp

[media] omap3isp: Move CCDC link validation to ccdc_link_validate()

2012-05-14 08:53:28 -03:00

pvrusb2

[media] pvrusb2: For querystd, start with list of hardware-supported standards

2012-05-07 16:58:00 -03:00

pwc

[media] v4l2-dev: rename two functions

2012-05-14 15:06:50 -03:00

s5p-fimc

[media] s5p-fimc: Fix control creation function

2012-06-18 19:49:27 -03:00

s5p-g2d

[media] s5p-g2d: Use devm_* functions in g2d.c file

2012-05-20 09:05:18 -03:00

s5p-jpeg

[media] s5p-jpeg: Use devm_* functions in jpeg-core.c file

2012-05-20 09:05:44 -03:00

s5p-mfc

[media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file

2012-06-18 19:49:06 -03:00

s5p-tv

[media] v4l: s5p-tv: Fix section mismatch warning in mixer_video.c

2012-05-20 09:02:45 -03:00

saa7134

[media] saa7134-cards: Remove a PCI entry added by mistake

2012-05-21 12:48:44 -03:00

saa7164

[media] saa7134: remove unused log_err() macro

2012-05-15 09:13:28 -03:00

smiapp

[media] smia: Fix compile failures

2012-06-18 19:52:05 -03:00

sn9c102

[media] v4l: fix compiler warnings

2012-05-14 14:47:03 -03:00

tlg2300

[media] tlg2300: Remove usage of KERNEL_VERSION()

2012-04-19 16:47:07 -03:00

tm6000

[media] v4l: fix compiler warnings

2012-05-14 14:49:38 -03:00

usbvision

[media] v4l: fix compiler warnings

2012-05-14 14:49:38 -03:00

uvc

[media] uvcvideo: Fix V4L2 button controls that share the same UVC control

2012-05-20 10:41:18 -03:00

zoran

[media] v4l: fix compiler warnings

2012-05-14 14:49:38 -03:00

adp1653.c

[media] v4l: Allow changing control handler lock

2012-05-14 08:46:27 -03:00

adv7170.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

adv7175.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

adv7180.c

[media] adv7180: add support to user controls

2012-05-20 11:59:22 -03:00

adv7183_regs.h

[media] adv7183: add adv7183 decoder driver

2012-03-19 15:04:10 -03:00

adv7183.c

[media] adv7183: add adv7183 decoder driver

2012-03-19 15:04:10 -03:00

adv7343_regs.h

[media] adv7343: use control framework

2011-03-21 20:31:49 -03:00

adv7343.c

[media] v4l: fix compiler warnings

2012-05-14 14:49:38 -03:00

ak881x.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

aptina-pll.c

[media] v4l: aptina-pll: Round up minimum multiplier factor value properly

2012-05-08 14:26:41 -03:00

aptina-pll.h

[media] v4l: Aptina-style sensor PLL support

2012-03-19 18:53:39 -03:00

arv.c

[media] arv: use latest frameworks

2012-05-20 08:43:42 -03:00

as3645a.c

[media] as3645a: move relevant code under __devinit/__devexit

2012-05-08 14:28:41 -03:00

atmel-isi.c

[media] soc-camera: Add plane layout information to struct soc_mbus_pixelfmt

2012-05-15 16:09:41 -03:00

bt819.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

bt856.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

bt866.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

btcx-risc.c

…

btcx-risc.h

…

bw-qcam.c

[media] bw-qcam: driver and pixfmt documentation fixes

2012-06-11 18:16:09 -03:00

c-qcam.c

[media] c-qcam: convert to the latest frameworks

2012-05-20 08:43:18 -03:00

cs53l32a.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

cs5345.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

cs8420.h

…

cx2341x.c

[media] v4l2-ctrls: use const char * const * for the menu arrays

2010-12-30 08:02:14 -02:00

fsl-viu.c

[media] v4l2-dev: add flag to have the core lock all file operations

2012-05-14 09:19:38 -03:00

hexium_gemini.c

[media] hexium-gemini: remove B&W control, fix input table

2012-05-14 15:01:45 -03:00

hexium_orion.c

[media] hexium-orion: fix incorrect input table

2012-05-14 15:02:03 -03:00

ibmmpeg2.h

…

imx074.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

indycam.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

indycam.h

…

ir-kbd-i2c.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

Kconfig

[media] au0828: Move the Kconfig knob under V4L_USB_DRIVERS

2012-05-20 13:20:40 -03:00

ks0127.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

ks0127.h

…

m52790.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

Makefile

[media] STA2X11 VIP: new V4L2 driver

2012-05-20 12:05:46 -03:00

mem2mem_testdev.c

[media] v4l: mem2mem_testdev: Fix race conditions in driver

2012-06-18 19:45:59 -03:00

meye.c

[media] V4L2: drivers implementing vidioc_default should also return -ENOTTY

2012-04-19 17:23:55 -03:00

meye.h

V4L/DVB: meye: remove last V4L1 remnants from the code and add v4l2_device

2010-05-18 00:52:36 -03:00

msp3400-driver.c

[media] Convert I2C drivers to dev_pm_ops

2012-05-15 07:38:43 -03:00

msp3400-driver.h

module_param: make bool parameters really bool (drivers & misc)

2012-01-13 09:32:20 +10:30

msp3400-kthreads.c

[media] msp3400: Add standards detection to the driver

2011-10-08 08:01:34 -03:00

mt9m001.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

mt9m032.c

[media] mt9m032: use the available subdev pointer, don't re-calculate it

2012-05-14 13:38:34 -03:00

mt9m111.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

mt9p031.c

[media] mt9p031: Implement black level compensation control

2012-05-14 13:37:39 -03:00

mt9t001.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

mt9t031.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

mt9t112.c

[media] V4L2: mt9t112: fixup JPEG initialization workaround

2012-05-15 16:15:35 -03:00

mt9v011.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

mt9v022.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

mt9v032.c

[media] mt9v032: Correct the logic for the auto-exposure setting

2012-05-14 13:39:02 -03:00

mx1_camera.c

[media] soc_camera: Use soc_camera_device::sizeimage to compute buffer sizes

2012-05-15 16:08:22 -03:00

mx2_camera.c

[media] Revert "[media] media: mx2_camera: Fix mbus format handling"

2012-06-18 08:17:42 -03:00

mx2_emmaprp.c

[media] v4l2-dev: add flag to have the core lock all file operations

2012-05-14 09:19:38 -03:00

mx3_camera.c

arm-soc: clock driver changes

2012-05-26 12:42:29 -07:00

mxb.c

[media] fixes and add querystd support to mxb

2012-05-14 15:01:04 -03:00

noon010pc30.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

omap1_camera.c

[media] soc-camera: Add plane layout information to struct soc_mbus_pixelfmt

2012-05-15 16:09:41 -03:00

omap24xxcam-dma.c

[media] video/omap24xxcam: use __iomem annotations

2012-05-15 07:50:27 -03:00

omap24xxcam.c

[media] video/omap24xxcam: use __iomem annotations

2012-05-15 07:50:27 -03:00

omap24xxcam.h

[media] video/omap24xxcam: use __iomem annotations

2012-05-15 07:50:27 -03:00

ov772x.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

ov2640.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

ov5642.c

[media] V4L: OV5642:remove redundant code to set cropping w/h

2012-04-10 21:31:19 -03:00

ov6650.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

ov7670.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

ov9640.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

ov9640.h

[media] ov9640: convert to the control framework

2011-11-03 18:28:36 -02:00

ov9740.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

pms.c

media: pms.c needs linux/slab.h

2012-06-20 22:10:08 -07:00

pxa_camera.c

[media] soc-camera: Add plane layout information to struct soc_mbus_pixelfmt

2012-05-15 16:09:41 -03:00

rj54n1cb0c.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

s5k6aa.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

s2255drv.c

[media] v4l: fix compiler warnings

2012-05-14 14:49:38 -03:00

saa711x_regs.h

…

saa717x.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

saa6588.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

saa7110.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

saa7115.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

saa7121.h

…

saa7127.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

saa7146.h

…

saa7146reg.h

…

saa7185.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

saa7191.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

saa7191.h

…

sh_mobile_ceu_camera.c

[media] V4L2: sh_mobile_ceu: manage lower 8bit bus

2012-05-15 16:15:14 -03:00

sh_mobile_csi2.c

[media] convert drivers/media/* to use module_platform_driver()

2012-01-10 23:27:13 -02:00

sh_vou.c

[media] v4l2-dev: add flag to have the core lock all file operations

2012-05-14 09:19:38 -03:00

smiapp-pll.c

[media] smiapp: Round minimum pre_pll up rather than down in ip_clk_freq check

2012-05-20 12:46:17 -03:00

smiapp-pll.h

[media] smiapp: Generic SMIA++/SMIA PLL calculator

2012-05-14 08:57:02 -03:00

soc_camera_platform.c

[media] convert drivers/media/* to use module_platform_driver()

2012-01-10 23:27:13 -02:00

soc_camera.c

[media] V4L: soc-camera: switch to using the existing .enum_framesizes()

2012-05-15 16:14:23 -03:00

soc_mediabus.c

[media] soc-camera: Add soc_mbus_image_size

2012-05-15 16:10:20 -03:00

sr030pc30.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

sta2x11_vip.c

[media] sta2x11_vip: Fix 60Hz video standard handling

2012-05-20 12:07:41 -03:00

sta2x11_vip.h

[media] STA2X11 VIP: new V4L2 driver

2012-05-20 12:05:46 -03:00

stk-sensor.c

…

stk-webcam.c

[media] stk-webcam: Don't flip the image by default

2012-05-07 16:11:03 -03:00

stk-webcam.h

…

tcm825x.c

drivers/media: Add module.h to all files using it implicitly

2011-10-31 19:31:51 -04:00

tcm825x.h

…

tda7432.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

tda9840.c

[media] tda9840: fix setting of the audio mode

2012-05-14 14:57:02 -03:00

tea6415c.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

tea6415c.h

…

tea6420.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

tea6420.h

…

ths7303.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

timblogiw.c

dmaengine/dma_slave: introduce inline wrappers

2012-03-21 19:20:22 +05:30

tlv320aic23b.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

tuner-core.c

[media] tuner-core: return the frequency range of the correct tuner

2012-06-11 18:12:56 -03:00

tvaudio.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

tveeprom.c

[media] tveeprom: update hauppauge tuner list thru 181

2012-02-28 18:46:53 -03:00

tvp514x_regs.h

…

tvp514x.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

tvp5150_reg.h

[media] tvp5150: Add video format registers configuration values

2011-10-08 08:01:52 -03:00

tvp5150.c

[media] media: tvp5150: Fix mbus format

2012-05-15 09:39:32 -03:00

tvp7002_reg.h

V4L/DVB: Definitions for TVP7002 in DM365

2010-02-26 15:11:01 -03:00

tvp7002.c

[media] tvp7002: add support for the new dv timings API

2012-05-20 08:30:09 -03:00

tw9910.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

upd64031a.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

upd64083.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

v4l2-common.c

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

v4l2-compat-ioctl32.c

[media] v4l2 framework: add support for the new dv_timings ioctls

2012-05-20 08:22:30 -03:00

v4l2-ctrls.c

[media] v4l2-event: fix regression with initial event handling

2012-05-15 08:43:06 -03:00

v4l2-dev.c

[media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()

2012-06-11 18:11:40 -03:00

v4l2-device.c

[media] media: fix truncated entity specification

2011-12-20 09:31:50 -02:00

v4l2-event.c

[media] v4l2-event: fix regression with initial event handling

2012-05-15 08:43:06 -03:00

v4l2-fh.c

drivers/media: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required

2011-10-31 19:31:51 -04:00

v4l2-int-device.c

drivers/media: Add module.h to all files using it implicitly

2011-10-31 19:31:51 -04:00

v4l2-ioctl.c

[media] v4l2-ioctl: set readbuffers to 2 in g_parm

2012-06-11 18:09:33 -03:00

v4l2-mem2mem.c

[media] media: mem2mem: eliminate possible NULL pointer dereference

2011-09-06 15:03:26 -03:00

v4l2-subdev.c

[media] v4l: Implement v4l2_subdev_link_validate()

2012-05-14 08:45:31 -03:00

via-camera.c

[media] via-camera: specify XO-1.5 camera clock speed

2012-05-14 16:35:22 -03:00

via-camera.h

[media] Add the via framebuffer camera controller driver

2010-10-21 13:45:28 -02:00

videobuf2-core.c

[media] videobuf2: Fix a bug in fileio emulation error handling

2012-05-14 09:20:54 -03:00

videobuf2-dma-contig.c

[media] media: videobuf2-dma-contig: quiet sparse noise about plain integer as NULL pointer

2012-05-08 14:35:14 -03:00

videobuf2-dma-sg.c

[media] media: vb2: fix potential deadlock in mmap vs. get_userptr handling

2011-12-30 16:06:49 -02:00

videobuf2-memops.c

[media] media: vb2-memops: Export vb2_get_vma symbol

2012-05-08 09:13:02 -03:00

videobuf2-vmalloc.c

[media] media: vb2: support userptr for PFN mappings

2012-03-08 07:42:17 -03:00

videobuf-core.c

[media] videobuf: only start streaming in poll() if so requested by the poll mask

2012-03-27 11:41:33 -03:00

videobuf-dma-contig.c

[media] videobuf-dma-contig: add cache support

2012-05-20 12:01:58 -03:00

videobuf-dma-sg.c

[media] videobuf_pages_to_sg: sglist[0] length problem

2011-07-27 17:52:19 -03:00

videobuf-dvb.c

[media] v4l/dvb: fix compiler warnings

2012-05-14 14:50:51 -03:00

videobuf-vmalloc.c

V4L/DVB: videobuf: add ext_lock argument to the queue init functions

2010-10-21 01:06:14 -02:00

vino.c

[media] vino: fix compiler warnings

2012-06-11 16:09:31 -03:00

vino.h

…

vivi.c

[media] Fix vivi regression

2012-06-11 15:16:29 -03:00

vp27smpx.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

vpx3220.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

vs6624_regs.h

[media] vs6624: add vs6624 sensor driver

2012-03-19 15:04:26 -03:00

vs6624.c

[media] vs6624: add vs6624 sensor driver

2012-03-19 15:04:26 -03:00

w9966.c

[media] w9966: convert to the latest frameworks

2012-05-20 08:44:00 -03:00

wm8739.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

wm8775.c

[media] convert drivers/media/* to use module_i2c_driver()

2012-03-08 08:48:01 -03:00

zr364xx.c

[media] v4l: fix compiler warnings

2012-05-14 14:49:38 -03:00