[media] saa7115: improve querystd handling for the saa7115

[linux-2.6-block.git] / drivers / media / i2c / saa7115.c

diff --git a/drivers/media/i2c/saa7115.c b/drivers/media/i2c/saa7115.c
index 6b6788cd08f6d6862020d0ab8d6b76e40fbb1402..cdff1f6e8546018c4b123d71990c35459f436adb 100644 (file)
--- a/drivers/media/i2c/saa7115.c
+++ b/drivers/media/i2c/saa7115.c
@@ -1259,6 +1259,12 @@ static int saa711x_s_routing(struct v4l2_subdev *sd,
                                (saa711x_read(sd, R_83_X_PORT_I_O_ENA_AND_OUT_CLK) & 0xfe) |
                                (state->output & 0x01));
        }
+       if (state->ident > V4L2_IDENT_SAA7111A) {
+               if (config & SAA7115_IDQ_IS_DEFAULT)
+                       saa711x_write(sd, R_85_I_PORT_SIGNAL_POLAR, 0x20);
+               else
+                       saa711x_write(sd, R_85_I_PORT_SIGNAL_POLAR, 0x21);
+       }
        return 0;
 }
 
@@ -1354,6 +1360,34 @@ static int saa711x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
         */
 
        reg1f = saa711x_read(sd, R_1F_STATUS_BYTE_2_VD_DEC);
+
+       if (state->ident == V4L2_IDENT_SAA7115) {
+               reg1e = saa711x_read(sd, R_1E_STATUS_BYTE_1_VD_DEC);
+
+               v4l2_dbg(1, debug, sd, "Status byte 1 (0x1e)=0x%02x\n", reg1e);
+
+               switch (reg1e & 0x03) {
+               case 1:
+                       *std &= V4L2_STD_NTSC;
+                       break;
+               case 2:
+                       /*
+                        * V4L2_STD_PAL just cover the european PAL standards.
+                        * This is wrong, as the device could also be using an
+                        * other PAL standard.
+                        */
+                       *std &= V4L2_STD_PAL   | V4L2_STD_PAL_N  | V4L2_STD_PAL_Nc |
+                               V4L2_STD_PAL_M | V4L2_STD_PAL_60;
+                       break;
+               case 3:
+                       *std &= V4L2_STD_SECAM;
+                       break;
+               default:
+                       /* Can't detect anything */
+                       break;
+               }
+       }
+
        v4l2_dbg(1, debug, sd, "Status byte 2 (0x1f)=0x%02x\n", reg1f);
 
        /* horizontal/vertical not locked */
@@ -1365,34 +1399,6 @@ static int saa711x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
        else
                *std &= V4L2_STD_625_50;
 
-       if (state->ident != V4L2_IDENT_SAA7115)
-               goto ret;
-
-       reg1e = saa711x_read(sd, R_1E_STATUS_BYTE_1_VD_DEC);
-
-       switch (reg1e & 0x03) {
-       case 1:
-               *std &= V4L2_STD_NTSC;
-               break;
-       case 2:
-               /*
-                * V4L2_STD_PAL just cover the european PAL standards.
-                * This is wrong, as the device could also be using an
-                * other PAL standard.
-                */
-               *std &= V4L2_STD_PAL   | V4L2_STD_PAL_N  | V4L2_STD_PAL_Nc |
-                       V4L2_STD_PAL_M | V4L2_STD_PAL_60;
-               break;
-       case 3:
-               *std &= V4L2_STD_SECAM;
-               break;
-       default:
-               /* Can't detect anything */
-               break;
-       }
-
-       v4l2_dbg(1, debug, sd, "Status byte 1 (0x1e)=0x%02x\n", reg1e);
-
 ret:
        v4l2_dbg(1, debug, sd, "detected std mask = %08Lx\n", *std);
 
@@ -1428,7 +1434,7 @@ static int saa711x_g_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *
        return 0;
 }
 
-static int saa711x_s_register(struct v4l2_subdev *sd, struct v4l2_dbg_register *reg)
+static int saa711x_s_register(struct v4l2_subdev *sd, const struct v4l2_dbg_register *reg)
 {
        struct i2c_client *client = v4l2_get_subdevdata(sd);