diff options
Diffstat (limited to 'drivers/media/dvb/frontends/au8522_decoder.c')
-rw-r--r-- | drivers/media/dvb/frontends/au8522_decoder.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c index d63e1527dc88..9e9a75576a1d 100644 --- a/drivers/media/dvb/frontends/au8522_decoder.c +++ b/drivers/media/dvb/frontends/au8522_decoder.c | |||
@@ -652,7 +652,7 @@ static int au8522_reset(struct v4l2_subdev *sd, u32 val) | |||
652 | } | 652 | } |
653 | 653 | ||
654 | static int au8522_s_video_routing(struct v4l2_subdev *sd, | 654 | static int au8522_s_video_routing(struct v4l2_subdev *sd, |
655 | const struct v4l2_routing *route) | 655 | u32 input, u32 output, u32 config) |
656 | { | 656 | { |
657 | struct au8522_state *state = to_state(sd); | 657 | struct au8522_state *state = to_state(sd); |
658 | 658 | ||
@@ -663,11 +663,11 @@ static int au8522_s_video_routing(struct v4l2_subdev *sd, | |||
663 | closed), and then came back to analog mode */ | 663 | closed), and then came back to analog mode */ |
664 | au8522_writereg(state, 0x106, 1); | 664 | au8522_writereg(state, 0x106, 1); |
665 | 665 | ||
666 | if (route->input == AU8522_COMPOSITE_CH1) { | 666 | if (input == AU8522_COMPOSITE_CH1) { |
667 | au8522_setup_cvbs_mode(state); | 667 | au8522_setup_cvbs_mode(state); |
668 | } else if (route->input == AU8522_SVIDEO_CH13) { | 668 | } else if (input == AU8522_SVIDEO_CH13) { |
669 | au8522_setup_svideo_mode(state); | 669 | au8522_setup_svideo_mode(state); |
670 | } else if (route->input == AU8522_COMPOSITE_CH4_SIF) { | 670 | } else if (input == AU8522_COMPOSITE_CH4_SIF) { |
671 | au8522_setup_cvbs_tuner_mode(state); | 671 | au8522_setup_cvbs_tuner_mode(state); |
672 | } else { | 672 | } else { |
673 | printk(KERN_ERR "au8522 mode not currently supported\n"); | 673 | printk(KERN_ERR "au8522 mode not currently supported\n"); |
@@ -677,10 +677,10 @@ static int au8522_s_video_routing(struct v4l2_subdev *sd, | |||
677 | } | 677 | } |
678 | 678 | ||
679 | static int au8522_s_audio_routing(struct v4l2_subdev *sd, | 679 | static int au8522_s_audio_routing(struct v4l2_subdev *sd, |
680 | const struct v4l2_routing *route) | 680 | u32 input, u32 output, u32 config) |
681 | { | 681 | { |
682 | struct au8522_state *state = to_state(sd); | 682 | struct au8522_state *state = to_state(sd); |
683 | set_audio_input(state, route->input); | 683 | set_audio_input(state, input); |
684 | return 0; | 684 | return 0; |
685 | } | 685 | } |
686 | 686 | ||