aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/media/dvb/dvb-usb/m920x.c11
-rw-r--r--drivers/media/dvb/frontends/qt1010.h8
2 files changed, 9 insertions, 10 deletions
diff --git a/drivers/media/dvb/dvb-usb/m920x.c b/drivers/media/dvb/dvb-usb/m920x.c
index 9e5ec080529..ba5332676b4 100644
--- a/drivers/media/dvb/dvb-usb/m920x.c
+++ b/drivers/media/dvb/dvb-usb/m920x.c
@@ -246,15 +246,6 @@ static int megasky_frontend_attach(struct dvb_usb_adapter *adap)
246 return -EIO; 246 return -EIO;
247} 247}
248 248
249static int megasky_tuner_attach(struct dvb_usb_adapter *adap)
250{
251 adap->pll_addr = 0xc4;
252 adap->pll_desc = NULL;
253 adap->fe->ops.tuner_ops.set_params = qt1010_set_params;
254
255 return 0;
256}
257
258static int m9206_set_filter(struct dvb_usb_adapter *adap, int type, int idx, int pid) 249static int m9206_set_filter(struct dvb_usb_adapter *adap, int type, int idx, int pid)
259{ 250{
260 int ret = 0; 251 int ret = 0;
@@ -452,7 +443,7 @@ static struct dvb_usb_device_properties megasky_properties = {
452 .pid_filter_ctrl = m9206_pid_filter_ctrl, 443 .pid_filter_ctrl = m9206_pid_filter_ctrl,
453 444
454 .frontend_attach = megasky_frontend_attach, 445 .frontend_attach = megasky_frontend_attach,
455 .tuner_attach = megasky_tuner_attach, 446 .tuner_attach = qt1010_tuner_attach,
456 447
457 .stream = { 448 .stream = {
458 .type = USB_BULK, 449 .type = USB_BULK,
diff --git a/drivers/media/dvb/frontends/qt1010.h b/drivers/media/dvb/frontends/qt1010.h
index 3a566085fa3..59ee1cd03e3 100644
--- a/drivers/media/dvb/frontends/qt1010.h
+++ b/drivers/media/dvb/frontends/qt1010.h
@@ -215,4 +215,12 @@ static int qt1010_set_params(struct dvb_frontend *fe, struct dvb_frontend_parame
215 return 0; 215 return 0;
216} 216}
217 217
218static int qt1010_tuner_attach(struct dvb_usb_adapter *adap)
219{
220 adap->pll_addr = 0xc4;
221 adap->pll_desc = NULL;
222 adap->fe->ops.tuner_ops.set_params = qt1010_set_params;
223
224 return 0;
225}
218#endif 226#endif