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 branch 'topic/hdsp' into for-linus
[pandora-kernel.git]
/
drivers
/
media
/
video
/
bt856.c
diff --git
a/drivers/media/video/bt856.c
b/drivers/media/video/bt856.c
index
78db395
..
d0b4d49
100644
(file)
--- a/
drivers/media/video/bt856.c
+++ b/
drivers/media/video/bt856.c
@@
-142,16
+142,17
@@
static int bt856_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std)
return 0;
}
return 0;
}
-static int bt856_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route)
+static int bt856_s_routing(struct v4l2_subdev *sd,
+ u32 input, u32 output, u32 config)
{
struct bt856 *encoder = to_bt856(sd);
{
struct bt856 *encoder = to_bt856(sd);
- v4l2_dbg(1, debug, sd, "set input %d\n",
route->
input);
+ v4l2_dbg(1, debug, sd, "set input %d\n", input);
/* We only have video bus.
/* We only have video bus.
- *
route->
input= 0: input is from bt819
- *
route->
input= 1: input is from ZR36060 */
- switch (
route->
input) {
+ * input= 0: input is from bt819
+ * input= 1: input is from ZR36060 */
+ switch (input) {
case 0:
bt856_setbit(encoder, 0xde, 4, 0);
bt856_setbit(encoder, 0xde, 3, 1);
case 0:
bt856_setbit(encoder, 0xde, 4, 0);
bt856_setbit(encoder, 0xde, 3, 1);