Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 250147
b: refs/heads/master
c: 59fb414
h: refs/heads/master
i:
  250145: d199c59
  250143: 44576bf
v: v3
  • Loading branch information
Antti Palosaari authored and Mauro Carvalho Chehab committed May 20, 2011
1 parent baaa839 commit 7dcdae2
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 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: a43be980b3cf9c72f4bac4c7ce043e52004c6d90
refs/heads/master: 59fb41409d21c491671f74c676373118f48e2136
28 changes: 14 additions & 14 deletions trunk/drivers/media/dvb/dvb-usb/anysee.c
Original file line number Diff line number Diff line change
Expand Up @@ -612,6 +612,20 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
/* E30 Combo Plus */
/* E30 C Plus */

if (dvb_usb_anysee_delsys) {
/* enable DVB-T tuner on IOE[0] */
ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (0 << 0),
0x01);
if (ret)
goto error;
} else {
/* enable DVB-C tuner on IOE[0] */
ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 0),
0x01);
if (ret)
goto error;
}

/* Try first attach TDA18212 silicon tuner on IOE[4], if that
* fails attach old simple PLL. */

Expand All @@ -631,20 +645,6 @@ static int anysee_tuner_attach(struct dvb_usb_adapter *adap)
if (ret)
goto error;

if (dvb_usb_anysee_delsys) {
/* enable DVB-T tuner on IOE[0] */
ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (0 << 0),
0x01);
if (ret)
goto error;
} else {
/* enable DVB-C tuner on IOE[0] */
ret = anysee_wr_reg_mask(adap->dev, REG_IOE, (1 << 0),
0x01);
if (ret)
goto error;
}

/* attach tuner */
dvb_attach(dvb_pll_attach, adap->fe, (0xc0 >> 1),
&adap->dev->i2c_adap, DVB_PLL_SAMSUNG_DTOS403IH102A);
Expand Down

0 comments on commit 7dcdae2

Please sign in to comment.