aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/pvrusb2/pvrusb2-dvb.c
diff options
context:
space:
mode:
authorMike Isely <isely@pobox.com>2008-02-09 15:44:30 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-04-24 14:09:46 -0300
commit891d99efc5be16d2762bdbb9d0486f7250990eee (patch)
tree42bf20210b0c44a43943b90acb8edae50f7ce4e2 /drivers/media/video/pvrusb2/pvrusb2-dvb.c
parenta36416d0a70899d3724d2e69e378062e06252a41 (diff)
downloadkernel_samsung_smdk4412-891d99efc5be16d2762bdbb9d0486f7250990eee.zip
kernel_samsung_smdk4412-891d99efc5be16d2762bdbb9d0486f7250990eee.tar.gz
kernel_samsung_smdk4412-891d99efc5be16d2762bdbb9d0486f7250990eee.tar.bz2
V4L/DVB (7689): pvrusb2-dvb: Rework module tear-down
Rather than making an explicit call to tear down the pvrusb2-dvb module, use the callback in the pvr2_channel structure. This has the advantage that now tear-down only happens when it makes sense. The previous implementation had scenarios where it was possible for the tear-down call to happen without a prior initialization. Signed-off-by: Mike Isely <isely@pobox.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/pvrusb2/pvrusb2-dvb.c')
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-dvb.c31
1 files changed, 19 insertions, 12 deletions
diff --git a/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/drivers/media/video/pvrusb2/pvrusb2-dvb.c
index ab60841..38077b2 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-dvb.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-dvb.c
@@ -386,30 +386,37 @@ static int pvr2_dvb_frontend_exit(struct pvr2_dvb_adapter *adap)
return 0;
}
+static void pvr2_dvb_done(struct pvr2_dvb_adapter *adap)
+{
+ pvr2_dvb_stream_end(adap);
+ pvr2_dvb_frontend_exit(adap);
+ pvr2_dvb_adapter_exit(adap);
+ pvr2_channel_done(&adap->channel);
+}
+
+static void pvr2_dvb_internal_check(struct pvr2_channel *chp)
+{
+ struct pvr2_dvb_adapter *adap;
+ adap = container_of(chp, struct pvr2_dvb_adapter, channel);
+ if (!adap->channel.mc_head->disconnect_flag) return;
+ pvr2_dvb_done(adap);
+}
+
int pvr2_dvb_init(struct pvr2_context *pvr)
{
int ret = 0;
struct pvr2_dvb_adapter *adap;
adap = &pvr->hdw->dvb;
- adap->init = !0;
pvr2_channel_init(&adap->channel, pvr);
+ adap->channel.check_func = pvr2_dvb_internal_check;
init_waitqueue_head(&adap->buffer_wait_data);
mutex_init(&pvr->hdw->dvb.lock);
ret = pvr2_dvb_adapter_init(&pvr->hdw->dvb);
if (ret < 0) goto fail;
ret = pvr2_dvb_frontend_init(&pvr->hdw->dvb);
+ return ret;
fail:
+ pvr2_channel_done(&adap->channel);
return ret;
}
-int pvr2_dvb_exit(struct pvr2_context *pvr)
-{
- struct pvr2_dvb_adapter *adap;
- adap = &pvr->hdw->dvb;
- if (!adap->init) return 0;
- pvr2_dvb_stream_end(adap);
- pvr2_dvb_frontend_exit(adap);
- pvr2_dvb_adapter_exit(adap);
- pvr2_channel_done(&adap->channel);
- return 0;
-}