Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=6c08d9290e2fc87b217d0f7c9cd67c9240ad7147
Commit: 6c08d9290e2fc87b217d0f7c9cd67c9240ad7147
Parent: 865dd115c95df6997f3d9dd638e6f92298f0422f
Author: Michael Krufky <[EMAIL PROTECTED]>
AuthorDate: Tue Jun 12 12:43:25 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Wed Jul 18 14:24:16 2007 -0300
V4L/DVB (5779): Dibusb-mb: fix broken 'tuner_pass_ctrl' functionality
'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 <[EMAIL PROTECTED]>
Signed-off-by: Patrick Boettcher <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/dvb/dvb-usb/dibusb-mb.c | 29 +++++++++++++++++++++++------
drivers/media/dvb/dvb-usb/dibusb.h | 1 +
drivers/media/dvb/dvb-usb/dvb-usb.h | 2 --
3 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c
b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index a171900..67cd484 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -14,6 +14,14 @@
*/
#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)
{
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)
return -ENODEV;
- adap->tuner_pass_ctrl = st->ops.tuner_pass_ctrl;
+ adap->fe->ops.i2c_gate_ctrl = dib3000mb_i2c_gate_ctrl;
return 0;
}
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_pll_tua6010xs);
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)
{
+ struct dibusb_state *st = adap->priv;
+
+ st->tuner_addr = 0x60;
+
dvb_attach(dvb_pll_attach, adap->fe, 0x60, &adap->dev->i2c_adap,
&dvb_pll_tda665x);
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 = I2C_M_RD, .buf = b2, .len = 1 },
};
+ struct dibusb_state *st = adap->priv;
/* 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)
- adap->tuner_pass_ctrl(adap->fe,1,msg[0].addr);
+ if (adap->fe->ops.i2c_gate_ctrl)
+ adap->fe->ops.i2c_gate_ctrl(adap->fe,1);
if (i2c_transfer(&adap->dev->i2c_adap, msg, 2) != 2) {
err("tuner i2c write failed.");
ret = -EREMOTEIO;
}
- if (adap->tuner_pass_ctrl)
- adap->tuner_pass_ctrl(adap->fe,0,msg[0].addr);
+ if (adap->fe->ops.i2c_gate_ctrl)
+ adap->fe->ops.i2c_gate_ctrl(adap->fe,0);
if (b2[0] == 0xfe) {
info("This device has the Thomson Cable onboard. Which is
default.");
diff --git a/drivers/media/dvb/dvb-usb/dibusb.h
b/drivers/media/dvb/dvb-usb/dibusb.h
index b607810..8e847aa 100644
--- a/drivers/media/dvb/dvb-usb/dibusb.h
+++ b/drivers/media/dvb/dvb-usb/dibusb.h
@@ -99,6 +99,7 @@
struct dibusb_state {
struct dib_fe_xfer_ops ops;
int mt2060_present;
+ u8 tuner_addr;
};
struct dibusb_device_state {
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb.h
b/drivers/media/dvb/dvb-usb/dvb-usb.h
index 70be200..d1b3c7b 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb.h
+++ b/drivers/media/dvb/dvb-usb/dvb-usb.h
@@ -297,8 +297,6 @@ struct dvb_usb_adapter {
int feedcount;
int pid_filtering;
- int (*tuner_pass_ctrl) (struct dvb_frontend *, int, u8);
-
/* dvb */
struct dvb_adapter dvb_adap;
struct dmxdev dmxdev;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
