diff options
Diffstat (limited to 'drivers/media/video/saa7110.c')
-rw-r--r-- | drivers/media/video/saa7110.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c index 8bb1fc17d195..5c24c993ac16 100644 --- a/drivers/media/video/saa7110.c +++ b/drivers/media/video/saa7110.c | |||
@@ -299,17 +299,18 @@ static int saa7110_s_std(struct v4l2_subdev *sd, v4l2_std_id std) | |||
299 | return 0; | 299 | return 0; |
300 | } | 300 | } |
301 | 301 | ||
302 | static int saa7110_s_routing(struct v4l2_subdev *sd, const struct v4l2_routing *route) | 302 | static int saa7110_s_routing(struct v4l2_subdev *sd, |
303 | u32 input, u32 output, u32 config) | ||
303 | { | 304 | { |
304 | struct saa7110 *decoder = to_saa7110(sd); | 305 | struct saa7110 *decoder = to_saa7110(sd); |
305 | 306 | ||
306 | if (route->input < 0 || route->input >= SAA7110_MAX_INPUT) { | 307 | if (input < 0 || input >= SAA7110_MAX_INPUT) { |
307 | v4l2_dbg(1, debug, sd, "input=%d not available\n", route->input); | 308 | v4l2_dbg(1, debug, sd, "input=%d not available\n", input); |
308 | return -EINVAL; | 309 | return -EINVAL; |
309 | } | 310 | } |
310 | if (decoder->input != route->input) { | 311 | if (decoder->input != input) { |
311 | saa7110_selmux(sd, route->input); | 312 | saa7110_selmux(sd, input); |
312 | v4l2_dbg(1, debug, sd, "switched to input=%d\n", route->input); | 313 | v4l2_dbg(1, debug, sd, "switched to input=%d\n", input); |
313 | } | 314 | } |
314 | return 0; | 315 | return 0; |
315 | } | 316 | } |