diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-video-v4l.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c index 61efa6f02200..767e49022f9b 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-video-v4l.c | |||
@@ -129,7 +129,7 @@ static const struct pvr2_v4l_decoder_ops decoder_ops[] = { | |||
129 | static void decoder_detach(struct pvr2_v4l_decoder *ctxt) | 129 | static void decoder_detach(struct pvr2_v4l_decoder *ctxt) |
130 | { | 130 | { |
131 | ctxt->client->handler = NULL; | 131 | ctxt->client->handler = NULL; |
132 | ctxt->hdw->decoder_ctrl = NULL; | 132 | pvr2_hdw_set_decoder(ctxt->hdw,NULL); |
133 | kfree(ctxt); | 133 | kfree(ctxt); |
134 | } | 134 | } |
135 | 135 | ||
@@ -217,7 +217,7 @@ int pvr2_i2c_decoder_v4l_setup(struct pvr2_hdw *hdw, | |||
217 | ctxt->client = cp; | 217 | ctxt->client = cp; |
218 | ctxt->hdw = hdw; | 218 | ctxt->hdw = hdw; |
219 | ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1; | 219 | ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1; |
220 | hdw->decoder_ctrl = &ctxt->ctrl; | 220 | pvr2_hdw_set_decoder(hdw,&ctxt->ctrl); |
221 | cp->handler = &ctxt->handler; | 221 | cp->handler = &ctxt->handler; |
222 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x saa711x V4L2 handler set up", | 222 | pvr2_trace(PVR2_TRACE_CHIPS,"i2c 0x%x saa711x V4L2 handler set up", |
223 | cp->client->addr); | 223 | cp->client->addr); |