projects
/
GitHub
/
LineageOS
/
android_kernel_motorola_exynos9610.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
416e87a
)
[media] saa7115: fix querystd
author
Hans Verkuil
<hans.verkuil@cisco.com>
Wed, 29 May 2013 13:18:58 +0000
(10:18 -0300)
committer
Mauro Carvalho Chehab
<mchehab@redhat.com>
Mon, 17 Jun 2013 12:43:14 +0000
(09:43 -0300)
Return V4L2_STD_UNKNOWN if no signal is detected.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/i2c/saa7115.c
patch
|
blob
|
blame
|
history
diff --git
a/drivers/media/i2c/saa7115.c
b/drivers/media/i2c/saa7115.c
index 90c43f3fb0f1a9d6bffaa4d288c90617cb4a7b38..7fd766ec64c8d5059f01e593dd52c6479ccc21dd 100644
(file)
--- a/
drivers/media/i2c/saa7115.c
+++ b/
drivers/media/i2c/saa7115.c
@@
-1428,6
+1428,7
@@
static int saa711x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
*std &= V4L2_STD_SECAM;
break;
default:
+ *std = V4L2_STD_UNKNOWN;
/* Can't detect anything */
break;
}
@@
-1436,8
+1437,10
@@
static int saa711x_querystd(struct v4l2_subdev *sd, v4l2_std_id *std)
v4l2_dbg(1, debug, sd, "Status byte 2 (0x1f)=0x%02x\n", reg1f);
/* horizontal/vertical not locked */
- if (reg1f & 0x40)
+ if (reg1f & 0x40) {
+ *std = V4L2_STD_UNKNOWN;
goto ret;
+ }
if (reg1f & 0x20)
*std &= V4L2_STD_525_60;