diff options
Diffstat (limited to 'drivers/media/video/bt866.c')
-rw-r--r-- | drivers/media/video/bt866.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/media/video/bt866.c b/drivers/media/video/bt866.c index 350cae4b02c3..af7e3a5bac9f 100644 --- a/drivers/media/video/bt866.c +++ b/drivers/media/video/bt866.c | |||
@@ -99,7 +99,8 @@ static int bt866_s_std_output(struct v4l2_subdev *sd, v4l2_std_id std) | |||
99 | return 0; | 99 | return 0; |
100 | } | 100 | } |
101 | 101 | ||
102 | static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route) | 102 | static int bt866_s_routing(struct v4l2_subdev *sd, |
103 | u32 input, u32 output, u32 config) | ||
103 | { | 104 | { |
104 | static const __u8 init[] = { | 105 | static const __u8 init[] = { |
105 | 0xc8, 0xcc, /* CRSCALE */ | 106 | 0xc8, 0xcc, /* CRSCALE */ |
@@ -137,7 +138,7 @@ static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *ro | |||
137 | 138 | ||
138 | val = encoder->reg[0xdc]; | 139 | val = encoder->reg[0xdc]; |
139 | 140 | ||
140 | if (route->input == 0) | 141 | if (input == 0) |
141 | val |= 0x40; /* CBSWAP */ | 142 | val |= 0x40; /* CBSWAP */ |
142 | else | 143 | else |
143 | val &= ~0x40; /* !CBSWAP */ | 144 | val &= ~0x40; /* !CBSWAP */ |
@@ -145,15 +146,15 @@ static int bt866_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *ro | |||
145 | bt866_write(encoder, 0xdc, val); | 146 | bt866_write(encoder, 0xdc, val); |
146 | 147 | ||
147 | val = encoder->reg[0xcc]; | 148 | val = encoder->reg[0xcc]; |
148 | if (route->input == 2) | 149 | if (input == 2) |
149 | val |= 0x01; /* OSDBAR */ | 150 | val |= 0x01; /* OSDBAR */ |
150 | else | 151 | else |
151 | val &= ~0x01; /* !OSDBAR */ | 152 | val &= ~0x01; /* !OSDBAR */ |
152 | bt866_write(encoder, 0xcc, val); | 153 | bt866_write(encoder, 0xcc, val); |
153 | 154 | ||
154 | v4l2_dbg(1, debug, sd, "set input %d\n", route->input); | 155 | v4l2_dbg(1, debug, sd, "set input %d\n", input); |
155 | 156 | ||
156 | switch (route->input) { | 157 | switch (input) { |
157 | case 0: | 158 | case 0: |
158 | case 1: | 159 | case 1: |
159 | case 2: | 160 | case 2: |