From: Linus Torvalds Date: Mon, 25 Feb 2013 01:35:10 +0000 (-0800) Subject: Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... X-Git-Tag: v3.9-rc1~93 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=21fbd5809ad126b949206d78e0a0e07ec872ea11;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git Merge branch 'v4l_for_linus' of git://git./linux/kernel/git/mchehab/linux-media 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" ... --- 21fbd5809ad126b949206d78e0a0e07ec872ea11 diff --cc MAINTAINERS index a92f485,5334229..870ba56 --- a/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 + M: Andrzej Hajda + L: linux-media@vger.kernel.org + S: Supported + F: drivers/media/i2c/s5c73m3/* + SERIAL DRIVERS -M: Alan Cox +M: Greg Kroah-Hartman L: linux-serial@vger.kernel.org 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 + L: linux-media@vger.kernel.org + 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 + L: linux-media@vger.kernel.org + T: git git://linuxtv.org/media_tree.git + W: http://linuxtv.org + S: Maintained + F: drivers/media/i2c/tea6420* + TEAM DRIVER -M: Jiri Pirko +M: Jiri Pirko L: netdev@vger.kernel.org S: Supported F: drivers/net/team/ diff --cc drivers/media/dvb-core/dvb_frontend.c index 0223ad2,b059abf..6e50a75 --- a/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 ||