Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=26a154c355cceba66ff13b383aa2019c28dbc685
Commit: 26a154c355cceba66ff13b383aa2019c28dbc685
Parent: 26247018be1ca7ca464f5f32e8ca7c897ded5393
Author: Aapo Tahkola <[EMAIL PROTECTED]>
AuthorDate: Mon Mar 5 18:25:36 2007 -0300
Committer: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
CommitDate: Fri Apr 27 15:44:36 2007 -0300
V4L/DVB (5424): Fix i2c implementation for gl861 and au6610
- r/w bit is not part of the i2c address
Signed-off-by: Aapo Tahkola <[EMAIL PROTECTED]>
Signed-off-by: Michael Krufky <[EMAIL PROTECTED]>
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
drivers/media/dvb/dvb-usb/au6610.c | 6 +++---
drivers/media/dvb/dvb-usb/gl861.c | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/dvb/dvb-usb/au6610.c
b/drivers/media/dvb/dvb-usb/au6610.c
index 0dc66a8..18e0b16 100644
--- a/drivers/media/dvb/dvb-usb/au6610.c
+++ b/drivers/media/dvb/dvb-usb/au6610.c
@@ -40,7 +40,7 @@ static int au6610_usb_msg(struct dvb_usb_device *d, u8
operation, u8 addr,
}
ret = usb_control_msg(d->udev, usb_rcvctrlpipe(d->udev, 0), operation,
- USB_TYPE_VENDOR|USB_DIR_IN, addr, index, usb_buf,
+ USB_TYPE_VENDOR|USB_DIR_IN, addr << 1, index,
usb_buf,
sizeof(usb_buf), AU6610_USB_TIMEOUT);
if (ret < 0)
@@ -124,7 +124,7 @@ static int au6610_identify_state(struct usb_device *udev,
}
static struct zl10353_config au6610_zl10353_config = {
- .demod_address = 0x1e,
+ .demod_address = 0x0f,
.no_tuner = 1,
.parallel_ts = 1,
};
@@ -140,7 +140,7 @@ static int au6610_zl10353_frontend_attach(struct
dvb_usb_adapter *adap)
}
static struct qt1010_config au6610_qt1010_config = {
- .i2c_address = 0xc4
+ .i2c_address = 0x62
};
static int au6610_qt1010_tuner_attach(struct dvb_usb_adapter *adap)
diff --git a/drivers/media/dvb/dvb-usb/gl861.c
b/drivers/media/dvb/dvb-usb/gl861.c
index d50f41f..e0587e6 100644
--- a/drivers/media/dvb/dvb-usb/gl861.c
+++ b/drivers/media/dvb/dvb-usb/gl861.c
@@ -20,7 +20,7 @@ static int gl861_i2c_msg(struct dvb_usb_device *d, u8 addr,
u8 *wbuf, u16 wlen, u8 *rbuf, u16 rlen)
{
u16 index;
- u16 value = addr << 8;
+ u16 value = addr << (8 + 1);
int wo = (rbuf == NULL || rlen == 0); /* write-only */
u8 req, type;
@@ -101,7 +101,7 @@ static int gl861_identify_state(struct usb_device *udev,
}
static struct zl10353_config gl861_zl10353_config = {
- .demod_address = 0x1e,
+ .demod_address = 0x0f,
.no_tuner = 1,
.parallel_ts = 1,
};
@@ -117,7 +117,7 @@ static int gl861_frontend_attach(struct dvb_usb_adapter
*adap)
}
static struct qt1010_config gl861_qt1010_config = {
- .i2c_address = 0xc4
+ .i2c_address = 0x62
};
static int gl861_tuner_attach(struct dvb_usb_adapter *adap)
-
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
