summaryrefslogtreecommitdiff
path: root/linux/drivers/media/dvb
diff options
context:
space:
mode:
authorPatrick Boettcher <devnull@localhost>2005-01-10 08:16:13 +0000
committerPatrick Boettcher <devnull@localhost>2005-01-10 08:16:13 +0000
commit86c2366cd308ce9f3a67629a04db7fe6c7d55341 (patch)
treec87998bd9f1ace3361436c48f25566699ed97e15 /linux/drivers/media/dvb
parent403f784b9360c964fdcdc8828ea413770df7874d (diff)
downloadmediapointer-dvb-s2-86c2366cd308ce9f3a67629a04db7fe6c7d55341.tar.gz
mediapointer-dvb-s2-86c2366cd308ce9f3a67629a04db7fe6c7d55341.tar.bz2
tuner recognition for all dibusb1.1 devices
Diffstat (limited to 'linux/drivers/media/dvb')
-rw-r--r--linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c5
-rw-r--r--linux/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c b/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
index d704e2a10..e8c4acba3 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
+++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-core.c
@@ -358,13 +358,14 @@ static struct dibusb_usb_device * dibusb_find_device (struct usb_device *udev,in
}
}
- for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].warm_ids[j] != NULL; j++)
- deb_info("check for warm %x %x\n",dibusb_devices[i].cold_ids[j]->idVendor, dibusb_devices[i].cold_ids[j]->idProduct);
+ for (j = 0; j < DIBUSB_ID_MAX_NUM && dibusb_devices[i].warm_ids[j] != NULL; j++) {
+ deb_info("check for warm %x %x\n",dibusb_devices[i].warm_ids[j]->idVendor, dibusb_devices[i].warm_ids[j]->idProduct);
if (dibusb_devices[i].warm_ids[j]->idVendor == udev->descriptor.idVendor &&
dibusb_devices[i].warm_ids[j]->idProduct == udev->descriptor.idProduct) {
*cold = 0;
return &dibusb_devices[i];
}
+ }
}
return NULL;
}
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 1ae5a6d85..3e82b0f5d 100644
--- a/linux/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c
+++ b/linux/drivers/media/dvb/dibusb/dvb-dibusb-fe-i2c.c
@@ -92,7 +92,8 @@ static struct mt352_config mt352_hanftek_umt_010_config = {
static int dibusb_tuner_quirk(struct usb_dibusb *dib)
{
switch (dib->dibdev->dev_cl->id) {
- case DIBUSB1_1_AN2235: { /* some these device have the ENV77H11D5 and some the THOMSON CABLE */
+ 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 */
struct dibusb_tuner *t;
u8 b[2] = { 0,0 } ,b2[1];
struct i2c_msg msg[2] = {