aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/video/cx88/cx88-dvb.c38
1 files changed, 20 insertions, 18 deletions
diff --git a/drivers/media/video/cx88/cx88-dvb.c b/drivers/media/video/cx88/cx88-dvb.c
index d9907ce8ad4b..694002a7dfc2 100644
--- a/drivers/media/video/cx88/cx88-dvb.c
+++ b/drivers/media/video/cx88/cx88-dvb.c
@@ -100,6 +100,26 @@ static struct videobuf_queue_ops dvb_qops = {
100}; 100};
101 101
102/* ------------------------------------------------------------------ */ 102/* ------------------------------------------------------------------ */
103
104static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe, int acquire)
105{
106 struct cx8802_dev *dev= fe->dvb->priv;
107 struct cx8802_driver *drv = NULL;
108 int ret = 0;
109
110 drv = cx8802_get_driver(dev, CX88_MPEG_DVB);
111 if (drv) {
112 if(acquire)
113 ret = drv->request_acquire(drv);
114 else
115 ret = drv->request_release(drv);
116 }
117
118 return ret;
119}
120
121/* ------------------------------------------------------------------ */
122
103static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe) 123static int dvico_fusionhdtv_demod_init(struct dvb_frontend* fe)
104{ 124{
105 static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x39 }; 125 static u8 clock_config [] = { CLOCK_CTL, 0x38, 0x39 };
@@ -287,24 +307,6 @@ static struct cx22702_config hauppauge_hvr_config = {
287 .output_mode = CX22702_SERIAL_OUTPUT, 307 .output_mode = CX22702_SERIAL_OUTPUT,
288}; 308};
289 309
290static int cx88_dvb_bus_ctrl(struct dvb_frontend* fe,
291 int acquire)
292{
293 struct cx8802_dev *dev= fe->dvb->priv;
294 struct cx8802_driver *drv = NULL;
295 int ret = 0;
296
297 drv = cx8802_get_driver(dev, CX88_MPEG_DVB);
298 if (drv) {
299 if(acquire)
300 ret = drv->request_acquire(drv);
301 else
302 ret = drv->request_release(drv);
303 }
304
305 return ret;
306}
307
308static int or51132_set_ts_param(struct dvb_frontend* fe, 310static int or51132_set_ts_param(struct dvb_frontend* fe,
309 int is_punctured) 311 int is_punctured)
310{ 312{