From 27a15a947bfce5951cf9ca15d1daed1ac0cce93c Mon Sep 17 00:00:00 2001 From: Mike Isely Date: Sat, 9 Feb 2008 16:29:52 -0300 Subject: [PATCH] --- yaml --- r: 92763 b: refs/heads/master c: 129a2f5efd95959c44a2bfeea8ee8b7c17252db6 h: refs/heads/master i: 92761: 5e85e5fa1c6579daca583794499f69ab5262be4b 92759: 72fb0c6feaa13f84bca5b130de44b20c0c61c735 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c | 15 ++++++++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index b7566607b053..c24cfd299c77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7dcc48fb55d18258e7db039f44a031e6828e6bad +refs/heads/master: 129a2f5efd95959c44a2bfeea8ee8b7c17252db6 diff --git a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c index f32d052ff4e6..177240051674 100644 --- a/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c +++ b/trunk/drivers/media/video/pvrusb2/pvrusb2-dvb.c @@ -401,16 +401,25 @@ int pvr2_dvb_init(struct pvr2_context *pvr) { int ret = 0; struct pvr2_dvb_adapter *adap; + if (!pvr->hdw->hdw_desc->dvb_props) { + /* Device lacks a digital interface so don't set up + the DVB side of the driver either. For now. */ + return 0; + } adap = &pvr->hdw->dvb; 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; + if (ret < 0) goto fail1; ret = pvr2_dvb_frontend_init(&pvr->hdw->dvb); - return ret; -fail: + if (ret < 0) goto fail2; + return 0; + +fail2: + pvr2_dvb_adapter_exit(adap); +fail1: pvr2_channel_done(&adap->channel); return ret; }