lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (7691): pvrusb2-dvb: Don't initialize if device lacks a digital side

Browse Source 
In the end we'd like the dvb interface to always be present - even for
analog devices (via the mpeg encoder).  However right now pvrusb2-dvb
won't operate correctly if the hardware doesn't have a digital tuner,
so don't initialize the DVB interface unless we know we have a digital
tuner.

Signed-off-by: Mike Isely <isely@pobox.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Mike Isely
2008-02-09 16:29:52 -03:00
committed by Mauro Carvalho Chehab
parent 7dcc48fb55
commit 129a2f5efd
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/media/video/pvrusb2/pvrusb2-dvb.c
View File

@@ -401,16 +401,25 @@ int pvr2_dvb_init(struct pvr2_context *pvr)
{ {
int ret = 0; int ret = 0;
struct pvr2_dvb_adapter *adap; 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; adap = &pvr->hdw->dvb;
pvr2_channel_init(&adap->channel, pvr); pvr2_channel_init(&adap->channel, pvr);
adap->channel.check_func = pvr2_dvb_internal_check; adap->channel.check_func = pvr2_dvb_internal_check;
init_waitqueue_head(&adap->buffer_wait_data); init_waitqueue_head(&adap->buffer_wait_data);
mutex_init(&pvr->hdw->dvb.lock); mutex_init(&pvr->hdw->dvb.lock);
ret = pvr2_dvb_adapter_init(&pvr->hdw->dvb); 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); ret = pvr2_dvb_frontend_init(&pvr->hdw->dvb);
return ret; if (ret < 0) goto fail2;
fail: return 0;
fail2:
pvr2_dvb_adapter_exit(adap);
fail1:
pvr2_channel_done(&adap->channel); pvr2_channel_done(&adap->channel);
return ret; return ret;
} }