aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/ttpci/av7110.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110.c')
-rw-r--r--drivers/media/dvb/ttpci/av7110.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 87ea52757a21..992be0be6b1e 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -217,10 +217,10 @@ static int arm_thread(void *data)
217 217
218 dprintk(4, "%p\n",av7110); 218 dprintk(4, "%p\n",av7110);
219 219
220 lock_kernel(); 220 lock_kernel();
221 daemonize("arm_mon"); 221 daemonize("arm_mon");
222 sigfillset(&current->blocked); 222 sigfillset(&current->blocked);
223 unlock_kernel(); 223 unlock_kernel();
224 224
225 av7110->arm_thread = current; 225 av7110->arm_thread = current;
226 226
@@ -1535,7 +1535,7 @@ static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_param
1535 buf[2] = ((div & 0x18000) >> 10) | 0x95; 1535 buf[2] = ((div & 0x18000) >> 10) | 0x95;
1536 buf[3] = (pwr << 6) | 0x30; 1536 buf[3] = (pwr << 6) | 0x30;
1537 1537
1538 // NOTE: since we're using a prescaler of 2, we set the 1538 // NOTE: since we're using a prescaler of 2, we set the
1539 // divisor frequency to 62.5kHz and divide by 125 above 1539 // divisor frequency to 62.5kHz and divide by 125 above
1540 1540
1541 if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1) 1541 if (i2c_transfer (&av7110->i2c_adap, &msg, 1) != 1)
@@ -1811,7 +1811,7 @@ static struct tda8083_config grundig_29504_451_config = {
1811static int philips_cd1516_pll_set(struct dvb_frontend* fe, 1811static int philips_cd1516_pll_set(struct dvb_frontend* fe,
1812 struct dvb_frontend_parameters* params) 1812 struct dvb_frontend_parameters* params)
1813{ 1813{
1814 struct av7110* av7110 = fe->dvb->priv; 1814 struct av7110* av7110 = fe->dvb->priv;
1815 u32 div; 1815 u32 div;
1816 u32 f = params->frequency; 1816 u32 f = params->frequency;
1817 u8 data[4]; 1817 u8 data[4];
@@ -2202,7 +2202,7 @@ static u8 read_pwm(struct av7110* av7110)
2202 struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 }, 2202 struct i2c_msg msg[] = { { .addr = 0x50,.flags = 0,.buf = &b,.len = 1 },
2203 { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} }; 2203 { .addr = 0x50,.flags = I2C_M_RD,.buf = &pwm,.len = 1} };
2204 2204
2205 if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff)) 2205 if ((i2c_transfer(&av7110->i2c_adap, msg, 2) != 2) || (pwm == 0xff))
2206 pwm = 0x48; 2206 pwm = 0x48;
2207 2207
2208 return pwm; 2208 return pwm;
@@ -2245,7 +2245,7 @@ static int frontend_init(struct av7110 *av7110)
2245 } 2245 }
2246 2246
2247 // Try the grundig 29504-451 2247 // Try the grundig 29504-451
2248 av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap); 2248 av7110->fe = tda8083_attach(&grundig_29504_451_config, &av7110->i2c_adap);
2249 if (av7110->fe) { 2249 if (av7110->fe) {
2250 av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd; 2250 av7110->fe->ops->diseqc_send_master_cmd = av7110_diseqc_send_master_cmd;
2251 av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst; 2251 av7110->fe->ops->diseqc_send_burst = av7110_diseqc_send_burst;
@@ -2271,12 +2271,12 @@ static int frontend_init(struct av7110 *av7110)
2271 case 0x0001: // Hauppauge/TT Nexus-T premium rev1.X 2271 case 0x0001: // Hauppauge/TT Nexus-T premium rev1.X
2272 2272
2273 // ALPS TDLB7 2273 // ALPS TDLB7
2274 av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap); 2274 av7110->fe = sp8870_attach(&alps_tdlb7_config, &av7110->i2c_adap);
2275 break; 2275 break;
2276 2276
2277 case 0x0002: // Hauppauge/TT DVB-C premium rev2.X 2277 case 0x0002: // Hauppauge/TT DVB-C premium rev2.X
2278 2278
2279 av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110)); 2279 av7110->fe = ves1820_attach(&alps_tdbe2_config, &av7110->i2c_adap, read_pwm(av7110));
2280 break; 2280 break;
2281 2281
2282 case 0x0006: /* Fujitsu-Siemens DVB-S rev 1.6 */ 2282 case 0x0006: /* Fujitsu-Siemens DVB-S rev 1.6 */
@@ -2421,9 +2421,9 @@ static int av7110_attach(struct saa7146_dev* dev, struct saa7146_pci_extension_d
2421 2421
2422 dprintk(4, "dev: %p\n", dev); 2422 dprintk(4, "dev: %p\n", dev);
2423 2423
2424 /* Set RPS_IRQ to 1 to track rps1 activity. 2424 /* Set RPS_IRQ to 1 to track rps1 activity.
2425 * Enabling this won't send any interrupt to PC CPU. 2425 * Enabling this won't send any interrupt to PC CPU.
2426 */ 2426 */
2427#define RPS_IRQ 0 2427#define RPS_IRQ 0
2428 2428
2429 if (budgetpatch == 1) { 2429 if (budgetpatch == 1) {