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

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (348 commits)
  [media] pctv452e: Remove bogus code
  [media] adv7175: Make use of media bus pixel codes
  [media] media: vb2: fix incorrect return value
  [media] em28xx: implement VIDIOC_ENUM_FRAMESIZES
  [media] cx23885: Stop the risc video fifo before reconfiguring it
  [media] cx23885: Avoid incorrect error handling and reporting
  [media] cx23885: Avoid stopping the risc engine during buffer timeout
  [media] cx23885: Removed a spurious function cx23885_set_scale()
  [media] cx23885: v4l2 api compliance, set the audioset field correctly
  [media] cx23885: hook the audio selection functions into the main driver
  [media] cx23885: add generic functions for dealing with audio input selection
  [media] cx23885: fixes related to maximum number of inputs and range checking
  [media] cx23885: Initial support for the MPX-885 mini-card
  [media] cx25840: Ensure AUDIO6 and AUDIO7 trigger line-in baseband use
  [media] cx23885: Enable audio line in support from the back panel
  [media] cx23885: Allow the audio mux config to be specified on a per input basis
  [media] cx25840: Enable support for non-tuner LR1/LR2 audio inputs
  [media] cx23885: Name an internal i2c part and declare a bitfield by name
  [media] cx23885: Ensure VBI buffers timeout quickly - bugfix for vbi hangs during streaming
  [media] cx23885: remove channel dump diagnostics when a vbi buffer times out
  ...

Fix up trivial conflicts in drivers/misc/altera-stapl/altera.c (header
file rename vs add)

1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/media/common/tuners/mt20xx.c b/drivers/media/common/tuners/mt20xx.c
index d0e70e10a71..0e74e97e0d1 100644
--- a/drivers/media/common/tuners/mt20xx.c
+++ b/drivers/media/common/tuners/mt20xx.c
@@ -430,11 +430,10 @@ static void mt2050_set_antenna(struct dvb_frontend *fe, unsigned char antenna)
 {
         struct microtune_priv *priv = fe->tuner_priv;
         unsigned char buf[2];
-        int ret;
 
         buf[0] = 6;
         buf[1] = antenna ? 0x11 : 0x10;
-        ret=tuner_i2c_xfer_send(&priv->i2c_props,buf,2);
+        tuner_i2c_xfer_send(&priv->i2c_props, buf, 2);
         tuner_dbg("mt2050: enabled antenna connector %d\n", antenna);
 }
 
@@ -574,21 +573,20 @@ static int mt2050_init(struct dvb_frontend *fe)
 {
         struct microtune_priv *priv = fe->tuner_priv;
         unsigned char buf[2];
-        int ret;
 
-        buf[0]=6;
-        buf[1]=0x10;
-        ret=tuner_i2c_xfer_send(&priv->i2c_props,buf,2); //  power
+        buf[0] = 6;
+        buf[1] = 0x10;
+        tuner_i2c_xfer_send(&priv->i2c_props, buf, 2); /* power */
 
-        buf[0]=0x0f;
-        buf[1]=0x0f;
-        ret=tuner_i2c_xfer_send(&priv->i2c_props,buf,2); // m1lo
+        buf[0] = 0x0f;
+        buf[1] = 0x0f;
+        tuner_i2c_xfer_send(&priv->i2c_props, buf, 2); /* m1lo */
 
-        buf[0]=0x0d;
-        ret=tuner_i2c_xfer_send(&priv->i2c_props,buf,1);
-        tuner_i2c_xfer_recv(&priv->i2c_props,buf,1);
+        buf[0] = 0x0d;
+        tuner_i2c_xfer_send(&priv->i2c_props, buf, 1);
+        tuner_i2c_xfer_recv(&priv->i2c_props, buf, 1);
 
-        tuner_dbg("mt2050: sro is %x\n",buf[0]);
+        tuner_dbg("mt2050: sro is %x\n", buf[0]);
 
         memcpy(&fe->ops.tuner_ops, &mt2050_tuner_ops, sizeof(struct dvb_tuner_ops));