Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30000
b: refs/heads/master
c: c9ce394
h: refs/heads/master
v: v3
  • Loading branch information
Michael Krufky authored and Mauro Carvalho Chehab committed Jun 25, 2006
1 parent 24bc976 commit 4903b93
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f14ac0bc455a255c48f9110080e8889c6d65cec2
refs/heads/master: c9ce394017162a90d79a4abc99eed3c7b2aed606
1 change: 1 addition & 0 deletions trunk/drivers/media/dvb/dvb-usb/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ config DVB_USB_CXUSB
select DVB_CX22702
select DVB_LGDT330X
select DVB_MT352
select DVB_ZL10353
help
Say Y here to support the Conexant USB2.0 hybrid reference design.
Currently, only DVB and ATSC modes are supported, analog mode
Expand Down
8 changes: 7 additions & 1 deletion trunk/drivers/media/dvb/dvb-usb/cxusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include "lg_h06xf.h"
#include "mt352.h"
#include "mt352_priv.h"
#include "zl10353.h"

/* debug */
int dvb_usb_cxusb_debug;
Expand Down Expand Up @@ -346,6 +347,10 @@ static struct mt352_config cxusb_dee1601_config = {
.demod_init = cxusb_dee1601_demod_init,
};

static struct zl10353_config cxusb_zl10353_dee1601_config = {
.demod_address = 0x0f,
};

static struct mt352_config cxusb_mt352_config = {
/* used in both lgz201 and th7579 */
.demod_address = 0x0f,
Expand Down Expand Up @@ -443,7 +448,8 @@ static int cxusb_dee1601_frontend_attach(struct dvb_usb_device *d)

cxusb_ctrl_msg(d,CMD_DIGITAL, NULL, 0, NULL, 0);

if ((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL)
if (((d->fe = mt352_attach(&cxusb_dee1601_config, &d->i2c_adap)) != NULL) ||
((d->fe = zl10353_attach(&cxusb_zl10353_dee1601_config, &d->i2c_adap)) != NULL))
return 0;

return -EIO;
Expand Down

0 comments on commit 4903b93

Please sign in to comment.