diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-audio.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-audio.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-audio.c b/drivers/media/video/pvrusb2/pvrusb2-audio.c index ccf2a3c7ad0..10ef1a2c13e 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-audio.c +++ b/drivers/media/video/pvrusb2/pvrusb2-audio.c | |||
@@ -58,9 +58,9 @@ static const struct routing_scheme routing_schemes[] = { | |||
58 | void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) | 58 | void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) |
59 | { | 59 | { |
60 | if (hdw->input_dirty || hdw->force_dirty) { | 60 | if (hdw->input_dirty || hdw->force_dirty) { |
61 | struct v4l2_routing route; | ||
62 | const struct routing_scheme *sp; | 61 | const struct routing_scheme *sp; |
63 | unsigned int sid = hdw->hdw_desc->signal_routing_scheme; | 62 | unsigned int sid = hdw->hdw_desc->signal_routing_scheme; |
63 | u32 input; | ||
64 | 64 | ||
65 | pvr2_trace(PVR2_TRACE_CHIPS, "subdev msp3400 v4l2 set_stereo"); | 65 | pvr2_trace(PVR2_TRACE_CHIPS, "subdev msp3400 v4l2 set_stereo"); |
66 | 66 | ||
@@ -68,7 +68,7 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) | |||
68 | ((sp = routing_schemes + sid) != NULL) && | 68 | ((sp = routing_schemes + sid) != NULL) && |
69 | (hdw->input_val >= 0) && | 69 | (hdw->input_val >= 0) && |
70 | (hdw->input_val < sp->cnt)) { | 70 | (hdw->input_val < sp->cnt)) { |
71 | route.input = sp->def[hdw->input_val]; | 71 | input = sp->def[hdw->input_val]; |
72 | } else { | 72 | } else { |
73 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, | 73 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, |
74 | "*** WARNING *** subdev msp3400 set_input:" | 74 | "*** WARNING *** subdev msp3400 set_input:" |
@@ -77,8 +77,8 @@ void pvr2_msp3400_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) | |||
77 | sid, hdw->input_val); | 77 | sid, hdw->input_val); |
78 | return; | 78 | return; |
79 | } | 79 | } |
80 | route.output = MSP_OUTPUT(MSP_SC_IN_DSP_SCART1); | 80 | sd->ops->audio->s_routing(sd, input, |
81 | sd->ops->audio->s_routing(sd, &route); | 81 | MSP_OUTPUT(MSP_SC_IN_DSP_SCART1), 0); |
82 | } | 82 | } |
83 | } | 83 | } |
84 | 84 | ||