V4L/DVB: V4L: tvp514x: Add Powerup sequence during s_input to lock the signal properly

[pandora-kernel.git] / drivers / media / video / tvp514x.c

diff --git a/drivers/media/video/tvp514x.c b/drivers/media/video/tvp514x.c
index e4815a1..e826114 100644 (file)
--- a/drivers/media/video/tvp514x.c
+++ b/drivers/media/video/tvp514x.c
@@ -79,6 +79,8 @@ struct tvp514x_std_info {
 };
 
 static struct tvp514x_reg tvp514x_reg_list_default[0x40];
+
+static int tvp514x_s_stream(struct v4l2_subdev *sd, int enable);
 /**
  * struct tvp514x_decoder - TVP5146/47 decoder object
  * @sd: Subdevice Slave handle
@@ -644,6 +646,17 @@ static int tvp514x_s_routing(struct v4l2_subdev *sd,
                /* Index out of bound */
                return -EINVAL;
 
+       /*
+        * For the sequence streamon -> streamoff and again s_input
+        * it fails to lock the signal, since streamoff puts TVP514x
+        * into power off state which leads to failure in sub-sequent s_input.
+        *
+        * So power up the TVP514x device here, since it is important to lock
+        * the signal at this stage.
+        */
+       if (!decoder->streaming)
+               tvp514x_s_stream(sd, 1);
+
        input_sel = input;
        output_sel = output;