From 7dcdae233482df3485e14f99d35a4f510e7687d1 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Tue, 12 Apr 2011 10:22:47 -0300 Subject: [PATCH] --- yaml --- r: 250147 b: refs/heads/master c: 59fb41409d21c491671f74c676373118f48e2136 h: refs/heads/master i: 250145: d199c5975972e1bc3343530f5fa8a32220d8707f 250143: 44576bf93485e7132cfa26633f98d991ee03bb1e v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/anysee.c | 28 ++++++++++++------------ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/[refs] b/[refs] index 37725f762f1a..3088bdd232e4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a43be980b3cf9c72f4bac4c7ce043e52004c6d90 +refs/heads/master: 59fb41409d21c491671f74c676373118f48e2136 diff --git a/trunk/drivers/media/dvb/dvb-usb/anysee.c b/trunk/drivers/media/dvb/dvb-usb/anysee.c index fa5acd040e93..b0cac60d286f 100644 --- a/trunk/drivers/media/dvb/dvb-usb/anysee.c +++ b/trunk/drivers/media/dvb/dvb-usb/anysee.c @@ -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. */ @@ -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);