From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 20 Feb 2013 01:20:26 +0000 (+1100)
Subject: Merge remote-tracking branch 'v4l-dvb/master'
X-Git-Tag: next-20130220~79
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8e62efd5a24ba8ca5f7f51be879c71d66eb638c4;p=karo-tx-linux.git

Merge remote-tracking branch 'v4l-dvb/master'
---

8e62efd5a24ba8ca5f7f51be879c71d66eb638c4
diff --cc MAINTAINERS
index 7378e2746f57,533422988824..86d24444f047
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -6610,8 -6757,15 +6789,15 @@@ S:	Maintaine
  F:	drivers/media/platform/s3c-camif/
  F:	include/media/s3c_camif.h
  
+ SAMSUNG S5C73M3 CAMERA DRIVER
+ M:	Kyungmin Park <kyungmin.park@samsung.com>
+ M:	Andrzej Hajda <a.hajda@samsung.com>
+ L:	linux-media@vger.kernel.org
+ S:	Supported
+ F:	drivers/media/i2c/s5c73m3/*
+ 
  SERIAL DRIVERS
 -M:	Alan Cox <alan@linux.intel.com>
 +M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:	linux-serial@vger.kernel.org
  S:	Maintained
  F:	drivers/tty/serial
@@@ -7560,8 -7755,24 +7786,24 @@@ T:	git git://linuxtv.org/media_tree.gi
  S:	Maintained
  F:	drivers/media/tuners/tea5767.*
  
+ TEA6415C MEDIA DRIVER
+ M:	Hans Verkuil <hverkuil@xs4all.nl>
+ 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 <hverkuil@xs4all.nl>
+ 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 <jpirko@redhat.com>
 +M:	Jiri Pirko <jiri@resnulli.us>
  L:	netdev@vger.kernel.org
  S:	Supported
  F:	drivers/net/team/
diff --cc drivers/media/dvb-core/dvb_frontend.c
index 0223ad255cb4,b059abf572d6..6e50a7581568
--- 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 ||