From e02d9d4747983f219cd84d203f3fbb310497c9b1 Mon Sep 17 00:00:00 2001 From: Patrick Boettcher Date: Wed, 12 Jan 2005 12:46:52 +0000 Subject: fixed: tuner_read was only done, when debugging was enabled --- linux/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c index 6415f263d..4afd72410 100644 --- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c +++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c @@ -14,7 +14,7 @@ #include -static int dibusb_i2c_msg(struct usb_dibusb *dib, u8 addr, +int dibusb_i2c_msg(struct usb_dibusb *dib, u8 addr, u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen) { u8 sndbuf[wlen+4]; /* lead(1) devaddr,direction(1) addr(2) data(wlen) (len(2) (when reading)) */ @@ -93,7 +93,7 @@ static int dibusb_tuner_quirk(struct usb_dibusb *dib) { switch (dib->dibdev->dev_cl->id) { case DIBUSB1_1: /* some these device have the ENV77H11D5 and some the THOMSON CABLE */ - case DIBUSB1_1_AN2235: { /* actually its this device, but in warm state they can't be divided */ + case DIBUSB1_1_AN2235: { /* actually its this device, but in warm state they are indistinguishable */ struct dibusb_tuner *t; u8 b[2] = { 0,0 } ,b2[1]; struct i2c_msg msg[2] = { @@ -107,7 +107,7 @@ static int dibusb_tuner_quirk(struct usb_dibusb *dib) if (dib->xfer_ops.tuner_pass_ctrl != NULL) dib->xfer_ops.tuner_pass_ctrl(dib->fe,1,t->pll_addr); - deb_info("ret: %d\n",dibusb_i2c_xfer(&dib->i2c_adap,msg,2)); + dibusb_i2c_xfer(&dib->i2c_adap,msg,2); if (dib->xfer_ops.tuner_pass_ctrl != NULL) dib->xfer_ops.tuner_pass_ctrl(dib->fe,0,t->pll_addr); @@ -209,11 +209,6 @@ int dibusb_i2c_init(struct usb_dibusb *dib) dib->init_state |= DIBUSB_STATE_I2C; -/* { - u8 b[3]; - b[0] = 0xff; b[1] = 0; b[2] = 0; dibusb_i2c_msg(dib, 0x8, b, 3, NULL,0); - dibusb_set_streaming_mode(dib,1); - }*/ return ret; } -- cgit v1.2.3