git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'kumar/merge' into merge
[pandora-kernel.git]
/
drivers
/
media
/
video
/
vpx3220.c
diff --git
a/drivers/media/video/vpx3220.c
b/drivers/media/video/vpx3220.c
index
75301d1
..
ca372eb
100644
(file)
--- a/
drivers/media/video/vpx3220.c
+++ b/
drivers/media/video/vpx3220.c
@@
-354,7
+354,7
@@
static int vpx3220_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
/* Here we back up the input selection because it gets
overwritten when we fill the registers with the
/* Here we back up the input selection because it gets
overwritten when we fill the registers with the
- cho
o
sen video norm */
+ chosen video norm */
temp_input = vpx3220_fp_read(sd, 0xf2);
v4l2_dbg(1, debug, sd, "s_std %llx\n", (unsigned long long)std);
temp_input = vpx3220_fp_read(sd, 0xf2);
v4l2_dbg(1, debug, sd, "s_std %llx\n", (unsigned long long)std);