diff options
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c')
-rw-r--r-- | drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c index e8a9252c7df..2cca817e414 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c +++ b/drivers/media/video/pvrusb2/pvrusb2-cx2584x-v4l.c | |||
@@ -140,7 +140,7 @@ static const struct pvr2_v4l_cx2584x_ops decoder_ops[] = { | |||
140 | static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt) | 140 | static void decoder_detach(struct pvr2_v4l_cx2584x *ctxt) |
141 | { | 141 | { |
142 | ctxt->client->handler = NULL; | 142 | ctxt->client->handler = NULL; |
143 | ctxt->hdw->decoder_ctrl = NULL; | 143 | pvr2_hdw_set_decoder(ctxt->hdw,NULL); |
144 | kfree(ctxt); | 144 | kfree(ctxt); |
145 | } | 145 | } |
146 | 146 | ||
@@ -241,7 +241,7 @@ int pvr2_i2c_cx2584x_v4l_setup(struct pvr2_hdw *hdw, | |||
241 | ctxt->client = cp; | 241 | ctxt->client = cp; |
242 | ctxt->hdw = hdw; | 242 | ctxt->hdw = hdw; |
243 | ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1; | 243 | ctxt->stale_mask = (1 << ARRAY_SIZE(decoder_ops)) - 1; |
244 | hdw->decoder_ctrl = &ctxt->ctrl; | 244 | pvr2_hdw_set_decoder(hdw,&ctxt->ctrl); |
245 | cp->handler = &ctxt->handler; | 245 | cp->handler = &ctxt->handler; |
246 | { | 246 | { |
247 | /* | 247 | /* |