Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 15:10:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

V4L/DVB (5779): Dibusb-mb: fix broken 'tuner_pass_ctrl' functionality

Browse Source 
'tuner_pass_ctrl' functionality of the dib3000-mb devices was broken in 
the previous changeset:

"dibusb-mb: convert pll handling to properly use dvb-pll"

This patch fixes this problem by assigning this functionality to the 
i2c_gate_ctrl callback

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Patrick Boettcher <pb@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Michael Krufky 2007-06-12 12:43:25 -03:00 committed by Mauro Carvalho Chehab
parent 865dd115c9
commit 6c08d9290e
3 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/media/dvb/dvb-usb/dibusb-mb.c
View File

@ -14,6 +14,14 @@
*/ */
#include "dibusb.h" #include "dibusb.h"
static int dib3000mb_i2c_gate_ctrl(struct dvb_frontend* fe, int enable)
{
struct dvb_usb_adapter *adap = fe->dvb->priv;
struct dibusb_state *st = adap->priv;
return st->ops.tuner_pass_ctrl(fe, enable, st->tuner_addr);
}
static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_adapter *adap) static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_adapter *adap)
{ {
struct dib3000_config demod_cfg; struct dib3000_config demod_cfg;
@ -25,13 +33,17 @@ static int dibusb_dib3000mb_frontend_attach(struct dvb_usb_adapter *adap)
&adap->dev->i2c_adap, &st->ops)) == NULL) &adap->dev->i2c_adap, &st->ops)) == NULL)
return -ENODEV; return -ENODEV;
adap->tuner_pass_ctrl = st->ops.tuner_pass_ctrl; adap->fe->ops.i2c_gate_ctrl = dib3000mb_i2c_gate_ctrl;
return 0; return 0;
} }
static int dibusb_thomson_tuner_attach(struct dvb_usb_adapter *adap) static int dibusb_thomson_tuner_attach(struct dvb_usb_adapter *adap)
{ {
struct dibusb_state *st = adap->priv;
st->tuner_addr = 0x61;
dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap, dvb_attach(dvb_pll_attach, adap->fe, 0x61, &adap->dev->i2c_adap,
&dvb_pll_tua6010xs); &dvb_pll_tua6010xs);
return 0; return 0;
@ -39,6 +51,10 @@ static int dibusb_thomson_tuner_attach(struct dvb_usb_adapter *adap)
static int dibusb_panasonic_tuner_attach(struct dvb_usb_adapter *adap) static int dibusb_panasonic_tuner_attach(struct dvb_usb_adapter *adap)
{ {
struct dibusb_state *st = adap->priv;
st->tuner_addr = 0x60;
dvb_attach(dvb_pll_attach, adap->fe, 0x60, &adap->dev->i2c_adap, dvb_attach(dvb_pll_attach, adap->fe, 0x60, &adap->dev->i2c_adap,
&dvb_pll_tda665x); &dvb_pll_tda665x);
return 0; return 0;
@ -55,20 +71,21 @@ static int dibusb_tuner_probe_and_attach(struct dvb_usb_adapter *adap)
{ .flags = 0, .buf = b, .len = 2 }, { .flags = 0, .buf = b, .len = 2 },
{ .flags = I2C_M_RD, .buf = b2, .len = 1 }, { .flags = I2C_M_RD, .buf = b2, .len = 1 },
}; };
struct dibusb_state *st = adap->priv;
/* the Panasonic sits on I2C addrass 0x60, the Thomson on 0x61 */ /* the Panasonic sits on I2C addrass 0x60, the Thomson on 0x61 */
msg[0].addr = msg[1].addr = 0x60; st->tuner_addr = 0x60;
if (adap->tuner_pass_ctrl) if (adap->fe->ops.i2c_gate_ctrl)
adap->tuner_pass_ctrl(adap->fe,1,msg[0].addr); adap->fe->ops.i2c_gate_ctrl(adap->fe,1);
if (i2c_transfer(&adap->dev->i2c_adap, msg, 2) != 2) { if (i2c_transfer(&adap->dev->i2c_adap, msg, 2) != 2) {
err("tuner i2c write failed."); err("tuner i2c write failed.");
ret = -EREMOTEIO; ret = -EREMOTEIO;
} }
if (adap->tuner_pass_ctrl) if (adap->fe->ops.i2c_gate_ctrl)
adap->tuner_pass_ctrl(adap->fe,0,msg[0].addr); adap->fe->ops.i2c_gate_ctrl(adap->fe,0);
if (b2[0] == 0xfe) { if (b2[0] == 0xfe) {
info("This device has the Thomson Cable onboard. Which is default."); info("This device has the Thomson Cable onboard. Which is default.");

1
drivers/media/dvb/dvb-usb/dibusb.h
View File

@ -99,6 +99,7 @@
struct dibusb_state { struct dibusb_state {
struct dib_fe_xfer_ops ops; struct dib_fe_xfer_ops ops;
int mt2060_present; int mt2060_present;
u8 tuner_addr;
}; };
struct dibusb_device_state { struct dibusb_device_state {

2
drivers/media/dvb/dvb-usb/dvb-usb.h
View File

@ -297,8 +297,6 @@ struct dvb_usb_adapter {
int feedcount; int feedcount;
int pid_filtering; int pid_filtering;
int (*tuner_pass_ctrl) (struct dvb_frontend *, int, u8);
/* dvb */ /* dvb */
struct dvb_adapter dvb_adap; struct dvb_adapter dvb_adap;
struct dmxdev dmxdev; struct dmxdev dmxdev;