diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-video-v4l.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c index b3862f5554bd..d2fe7c8f2c3a 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | |||
@@ -75,16 +75,17 @@ static const struct routing_scheme routing_schemes[] = { | |||
75 | void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) | 75 | void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) |
76 | { | 76 | { |
77 | if (hdw->input_dirty || hdw->force_dirty) { | 77 | if (hdw->input_dirty || hdw->force_dirty) { |
78 | struct v4l2_routing route; | ||
79 | const struct routing_scheme *sp; | 78 | const struct routing_scheme *sp; |
80 | unsigned int sid = hdw->hdw_desc->signal_routing_scheme; | 79 | unsigned int sid = hdw->hdw_desc->signal_routing_scheme; |
80 | u32 input; | ||
81 | |||
81 | pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)", | 82 | pvr2_trace(PVR2_TRACE_CHIPS, "subdev v4l2 set_input(%d)", |
82 | hdw->input_val); | 83 | hdw->input_val); |
83 | if ((sid < ARRAY_SIZE(routing_schemes)) && | 84 | if ((sid < ARRAY_SIZE(routing_schemes)) && |
84 | ((sp = routing_schemes + sid) != NULL) && | 85 | ((sp = routing_schemes + sid) != NULL) && |
85 | (hdw->input_val >= 0) && | 86 | (hdw->input_val >= 0) && |
86 | (hdw->input_val < sp->cnt)) { | 87 | (hdw->input_val < sp->cnt)) { |
87 | route.input = sp->def[hdw->input_val]; | 88 | input = sp->def[hdw->input_val]; |
88 | } else { | 89 | } else { |
89 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, | 90 | pvr2_trace(PVR2_TRACE_ERROR_LEGS, |
90 | "*** WARNING *** subdev v4l2 set_input:" | 91 | "*** WARNING *** subdev v4l2 set_input:" |
@@ -93,8 +94,7 @@ void pvr2_saa7115_subdev_update(struct pvr2_hdw *hdw, struct v4l2_subdev *sd) | |||
93 | sid, hdw->input_val); | 94 | sid, hdw->input_val); |
94 | return; | 95 | return; |
95 | } | 96 | } |
96 | route.output = 0; | 97 | sd->ops->video->s_routing(sd, input, 0, 0); |
97 | sd->ops->video->s_routing(sd, &route); | ||
98 | } | 98 | } |
99 | } | 99 | } |
100 | 100 | ||