aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/saa7115.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c
index 301c62b88cad..f35459d1f42f 100644
--- a/drivers/media/video/saa7115.c
+++ b/drivers/media/video/saa7115.c
@@ -1348,8 +1348,17 @@ static int saa711x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
1348 int reg1e; 1348 int reg1e;
1349 1349
1350 *std = V4L2_STD_ALL; 1350 *std = V4L2_STD_ALL;
1351 if (state->ident != V4L2_IDENT_SAA7115) 1351 if (state->ident != V4L2_IDENT_SAA7115) {
1352 int reg1f = saa711x_read(sd, R_1F_STATUS_BYTE_2_VD_DEC);
1353
1354 if (reg1f & 0x20)
1355 *std = V4L2_STD_525_60;
1356 else
1357 *std = V4L2_STD_625_50;
1358
1352 return 0; 1359 return 0;
1360 }
1361
1353 reg1e = saa711x_read(sd, R_1E_STATUS_BYTE_1_VD_DEC); 1362 reg1e = saa711x_read(sd, R_1E_STATUS_BYTE_1_VD_DEC);
1354 1363
1355 switch (reg1e & 0x03) { 1364 switch (reg1e & 0x03) {