1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 692dc69f691d..423e954948be 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -973,12 +973,12 @@ audio_mux(struct bttv *btv, int input, int mute)
                   For now this is sufficient. */
                switch (input) {
                case TVAUDIO_INPUT_RADIO:
-                        route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
+                        route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                        break;
                case TVAUDIO_INPUT_EXTERN:
-                        route.input = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1,
+                        route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                        break;
                case TVAUDIO_INPUT_INTERN:
                        /* Yes, this is the same input as for RADIO. I doubt
@@ -986,8 +986,8 @@ audio_mux(struct bttv *btv, int input, int mute)
                           input is the BTTV_BOARD_AVERMEDIA98. I wonder how
                           that was tested. My guess is that the whole INTERN
                           input does not work. */
-                        route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,
+                        route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
-                                    MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);
+                                    MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
                        break;
                case TVAUDIO_INPUT_TUNER:
                default:

diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 692dc69f691d..423e954948be 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -973,12 +973,12 @@ audio_mux(struct bttv *btv, int input, int mute)
973	For now this is sufficient. */	973	For now this is sufficient. */
974	switch (input) {	974	switch (input) {
975	case TVAUDIO_INPUT_RADIO:	975	case TVAUDIO_INPUT_RADIO:
976	route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,	976	route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
977	MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);	977	MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
978	break;	978	break;
979	case TVAUDIO_INPUT_EXTERN:	979	case TVAUDIO_INPUT_EXTERN:
980	route.input = MSP_INPUT(MSP_IN_SCART_1, MSP_IN_TUNER_1,	980	route.input = MSP_INPUT(MSP_IN_SCART1, MSP_IN_TUNER1,
981	MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);	981	MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
982	break;	982	break;
983	case TVAUDIO_INPUT_INTERN:	983	case TVAUDIO_INPUT_INTERN:
984	/* Yes, this is the same input as for RADIO. I doubt	984	/* Yes, this is the same input as for RADIO. I doubt
@@ -986,8 +986,8 @@ audio_mux(struct bttv *btv, int input, int mute)
986	input is the BTTV_BOARD_AVERMEDIA98. I wonder how	986	input is the BTTV_BOARD_AVERMEDIA98. I wonder how
987	that was tested. My guess is that the whole INTERN	987	that was tested. My guess is that the whole INTERN
988	input does not work. */	988	input does not work. */
989	route.input = MSP_INPUT(MSP_IN_SCART_2, MSP_IN_TUNER_1,	989	route.input = MSP_INPUT(MSP_IN_SCART2, MSP_IN_TUNER1,
990	MSP_DSP_OUT_SCART, MSP_DSP_OUT_SCART);	990	MSP_DSP_IN_SCART, MSP_DSP_IN_SCART);
991	break;	991	break;
992	case TVAUDIO_INPUT_TUNER:	992	case TVAUDIO_INPUT_TUNER:
993	default:	993	default: