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

Pull media updates from Mauro Carvalho Chehab:

 - Some cleanups at V4L2 documentation

 - new drivers: ts2020 frontend, ov9650 sensor, s5c73m3 sensor,
   sh-mobile veu mem2mem driver, radio-ma901, davinci_vpfe staging
   driver

 - Lots of missing MAINTAINERS entries added

 - several em28xx driver improvements, including its conversion to
   videobuf2

 - several fixups on drivers to make them to better comply with the API

 - DVB core: add support for DVBv5 stats, allowing the implementation of
   statistics for new standards like ISDB

 - mb86a20s: add statistics to the driver

 - lots of new board additions, cleanups, and driver improvements.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (596 commits)
  [media] media: Add 0x3009 USB PID to ttusb2 driver (fixed diff)
  [media] rtl28xxu: Add USB IDs for Compro VideoMate U620F
  [media] em28xx: add usb id for terratec h5 rev. 3
  [media] media: rc: gpio-ir-recv: add support for device tree parsing
  [media] mceusb: move check earlier to make smatch happy
  [media] radio-si470x doc: add info about v4l2-ctl and sox+alsa
  [media] staging: media: Remove unnecessary OOM messages
  [media] sh_vou: Use vou_dev instead of vou_file wherever possible
  [media] sh_vou: Use video_drvdata()
  [media] drivers/media/platform/soc_camera/pxa_camera.c: use devm_ functions
  [media] mt9t112: mt9t111 format set up differs from mt9t112
  [media] sh-mobile-ceu-camera: fix SHARPNESS control default
  Revert "[media] fc0011: Return early, if the frequency is already tuned"
  [media] cx18/ivtv: fix regression: remove __init from a non-init function
  [media] em28xx: fix analog streaming with USB bulk transfers
  [media] stv0900: remove unnecessary null pointer check
  [media] fc0011: Return early, if the frequency is already tuned
  [media] fc0011: Add some sanity checks and cleanups
  [media] fc0011: Fix xin value clamping
  Revert "[media] [PATH,1/2] mxl5007 move reset to attach"
  ...

diff --cc MAINTAINERS
index a92f485f54568589df0cefbe66664d07e4ce4557,5334229888248761284e63ae8b2d670dbef3e10b..870ba56207d74a9de026c530ea7d259af7f54b3e
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6605,8 -6757,15 +6784,15 @@@ S:    Maintaine
  F:    drivers/media/platform/s3c-camif/
  F:    include/media/s3c_camif.h
  
+ SAMSUNG S5C73M3 CAMERA DRIVER
+ M:    Kyungmin Park <[email protected]>
+ M:    Andrzej Hajda <[email protected]>
+ L:    [email protected]
+ S:    Supported
+ F:    drivers/media/i2c/s5c73m3/*
+ 
  SERIAL DRIVERS
 -M:    Alan Cox <[email protected]>
 +M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/tty/serial
@@@ -7549,8 -7755,24 +7775,24 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/tuners/tea5767.*
  
+ TEA6415C MEDIA DRIVER
+ M:    Hans Verkuil <[email protected]>
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ W:    http://linuxtv.org
+ S:    Maintained
+ F:    drivers/media/i2c/tea6415c*
+ 
+ TEA6420 MEDIA DRIVER
+ M:    Hans Verkuil <[email protected]>
+ L:    [email protected]
+ T:    git git://linuxtv.org/media_tree.git
+ W:    http://linuxtv.org
+ S:    Maintained
+ F:    drivers/media/i2c/tea6420*
+ 
  TEAM DRIVER
 -M:    Jiri Pirko <j[email protected]>
 +M:    Jiri Pirko <j[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/team/

diff --cc arch/arm/mach-davinci/board-da850-evm.c
Simple merge

diff --cc arch/arm/mach-davinci/board-dm644x-evm.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

diff --cc arch/arm/mach-s5pv210/mach-goni.c
Simple merge

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/media/Kconfig
Simple merge

diff --cc drivers/media/dvb-core/dvb_frontend.c
index 0223ad255cb4c7e1f3218aa5a0f5debb076963fd,b059abf572d6d1afffbc2efb899509506d155ef4..6e50a758156817834e314bd7ca6222a8c9c8f2e2
--- 1/drivers/media/dvb-core/dvb_frontend.c
--- 2/drivers/media/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb-core/dvb_frontend.c
@@@ -1820,11 -1863,16 +1863,16 @@@ static int dvb_frontend_ioctl(struct fi
        struct dvb_frontend *fe = dvbdev->priv;
        struct dtv_frontend_properties *c = &fe->dtv_property_cache;
        struct dvb_frontend_private *fepriv = fe->frontend_priv;
 -      int err = -ENOTTY;
 +      int err = -EOPNOTSUPP;
  
        dev_dbg(fe->dvb->device, "%s: (%d)\n", __func__, _IOC_NR(cmd));
-       if (fepriv->exit != DVB_FE_NO_EXIT)
+       if (down_interruptible(&fepriv->sem))
+               return -ERESTARTSYS;
+ 
+       if (fepriv->exit != DVB_FE_NO_EXIT) {
+               up(&fepriv->sem);
                return -ENODEV;
+       }
  
        if ((file->f_flags & O_ACCMODE) == O_RDONLY &&
            (_IOC_DIR(cmd) != _IOC_READ || cmd == FE_GET_EVENT ||

diff --cc drivers/media/platform/Kconfig
Simple merge

diff --cc drivers/media/platform/coda.c
Simple merge

diff --cc drivers/media/platform/davinci/vpss.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx2_camera.c
Simple merge

diff --cc drivers/media/radio/Kconfig
Simple merge

diff --cc drivers/media/radio/radio-wl1273.c
Simple merge

diff --cc drivers/media/usb/dvb-usb-v2/Kconfig
Simple merge