aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/dvb')
-rw-r--r--drivers/media/dvb/b2c2/flexcop-pci.c2
-rw-r--r--drivers/media/dvb/bt8xx/dvb-bt8xx.c4
-rw-r--r--drivers/media/dvb/dvb-core/dvb_frontend.c4
-rw-r--r--drivers/media/dvb/dvb-usb/af9005-fe.c8
-rw-r--r--drivers/media/dvb/dvb-usb/friio.h2
-rw-r--r--drivers/media/dvb/dvb-usb/lmedm04.c12
-rw-r--r--drivers/media/dvb/frontends/atbm8830.h2
-rw-r--r--drivers/media/dvb/frontends/au8522_dig.c6
-rw-r--r--drivers/media/dvb/frontends/bcm3510.c6
-rw-r--r--drivers/media/dvb/frontends/cx22700.c2
-rw-r--r--drivers/media/dvb/frontends/cx22702.c6
-rw-r--r--drivers/media/dvb/frontends/cx24110.c2
-rw-r--r--drivers/media/dvb/frontends/cx24113.h2
-rw-r--r--drivers/media/dvb/frontends/cx24123.c2
-rw-r--r--drivers/media/dvb/frontends/drx397xD.c2
-rw-r--r--drivers/media/dvb/frontends/mb86a16.c2
-rw-r--r--drivers/media/dvb/frontends/mb86a20s.c2
-rw-r--r--drivers/media/dvb/frontends/mt312.c2
-rw-r--r--drivers/media/dvb/frontends/s5h1420.c2
-rw-r--r--drivers/media/dvb/frontends/stb6100.c2
-rw-r--r--drivers/media/dvb/frontends/stv0297.c2
-rw-r--r--drivers/media/dvb/frontends/stv0367.c2
-rw-r--r--drivers/media/dvb/frontends/stv0900_priv.h2
-rw-r--r--drivers/media/dvb/frontends/stv090x.c12
-rw-r--r--drivers/media/dvb/mantis/mantis_uart.c2
-rw-r--r--drivers/media/dvb/ngene/ngene-core.c4
-rw-r--r--drivers/media/dvb/pluto2/pluto2.c10
-rw-r--r--drivers/media/dvb/siano/smsdvb.c2
-rw-r--r--drivers/media/dvb/ttpci/av7110.c2
-rw-r--r--drivers/media/dvb/ttpci/budget-patch.c2
-rw-r--r--drivers/media/dvb/ttusb-dec/ttusb_dec.c2
31 files changed, 57 insertions, 57 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop-pci.c b/drivers/media/dvb/b2c2/flexcop-pci.c
index 227c0200b70a..955254090a0e 100644
--- a/drivers/media/dvb/b2c2/flexcop-pci.c
+++ b/drivers/media/dvb/b2c2/flexcop-pci.c
@@ -58,7 +58,7 @@ struct flexcop_pci {
58 58
59 int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */ 59 int active_dma1_addr; /* 0 = addr0 of dma1; 1 = addr1 of dma1 */
60 u32 last_dma1_cur_pos; 60 u32 last_dma1_cur_pos;
61 /* position of the pointer last time the timer/packet irq occured */ 61 /* position of the pointer last time the timer/packet irq occurred */
62 int count; 62 int count;
63 int count_prev; 63 int count_prev;
64 int stream_problem; 64 int stream_problem;
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 78fc469f0f69..1e1106dcd063 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -427,10 +427,10 @@ static void or51211_reset(struct dvb_frontend * fe)
427 struct dvb_bt8xx_card *bt = fe->dvb->priv; 427 struct dvb_bt8xx_card *bt = fe->dvb->priv;
428 428
429 /* RESET DEVICE 429 /* RESET DEVICE
430 * reset is controled by GPIO-0 430 * reset is controlled by GPIO-0
431 * when set to 0 causes reset and when to 1 for normal op 431 * when set to 0 causes reset and when to 1 for normal op
432 * must remain reset for 128 clock cycles on a 50Mhz clock 432 * must remain reset for 128 clock cycles on a 50Mhz clock
433 * also PRM1 PRM2 & PRM4 are controled by GPIO-1,GPIO-2 & GPIO-4 433 * also PRM1 PRM2 & PRM4 are controlled by GPIO-1,GPIO-2 & GPIO-4
434 * We assume that the reset has be held low long enough or we 434 * We assume that the reset has be held low long enough or we
435 * have been reset by a power on. When the driver is unloaded 435 * have been reset by a power on. When the driver is unloaded
436 * reset set to 0 so if reloaded we have been reset. 436 * reset set to 0 so if reloaded we have been reset.
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index cad6634610ea..31e2c0d45db3 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -1638,7 +1638,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
1638 case FE_READ_STATUS: { 1638 case FE_READ_STATUS: {
1639 fe_status_t* status = parg; 1639 fe_status_t* status = parg;
1640 1640
1641 /* if retune was requested but hasn't occured yet, prevent 1641 /* if retune was requested but hasn't occurred yet, prevent
1642 * that user get signal state from previous tuning */ 1642 * that user get signal state from previous tuning */
1643 if (fepriv->state == FESTATE_RETUNE || 1643 if (fepriv->state == FESTATE_RETUNE ||
1644 fepriv->state == FESTATE_ERROR) { 1644 fepriv->state == FESTATE_ERROR) {
@@ -1729,7 +1729,7 @@ static int dvb_frontend_ioctl_legacy(struct file *file,
1729 * Dish network legacy switches (as used by Dish500) 1729 * Dish network legacy switches (as used by Dish500)
1730 * are controlled by sending 9-bit command words 1730 * are controlled by sending 9-bit command words
1731 * spaced 8msec apart. 1731 * spaced 8msec apart.
1732 * the actual command word is switch/port dependant 1732 * the actual command word is switch/port dependent
1733 * so it is up to the userspace application to send 1733 * so it is up to the userspace application to send
1734 * the right command. 1734 * the right command.
1735 * The command must always start with a '0' after 1735 * The command must always start with a '0' after
diff --git a/drivers/media/dvb/dvb-usb/af9005-fe.c b/drivers/media/dvb/dvb-usb/af9005-fe.c
index 199ece0d4883..6ad94745bbdd 100644
--- a/drivers/media/dvb/dvb-usb/af9005-fe.c
+++ b/drivers/media/dvb/dvb-usb/af9005-fe.c
@@ -580,7 +580,7 @@ static int af9005_fe_program_cfoe(struct dvb_usb_device *d, fe_bandwidth_t bw)
580 NS_coeff2_8k = 0x724925; 580 NS_coeff2_8k = 0x724925;
581 break; 581 break;
582 default: 582 default:
583 err("Invalid bandwith %d.", bw); 583 err("Invalid bandwidth %d.", bw);
584 return -EINVAL; 584 return -EINVAL;
585 } 585 }
586 586
@@ -789,7 +789,7 @@ static int af9005_fe_select_bw(struct dvb_usb_device *d, fe_bandwidth_t bw)
789 temp = 2; 789 temp = 2;
790 break; 790 break;
791 default: 791 default:
792 err("Invalid bandwith %d.", bw); 792 err("Invalid bandwidth %d.", bw);
793 return -EINVAL; 793 return -EINVAL;
794 } 794 }
795 return af9005_write_register_bits(d, xd_g_reg_bw, reg_bw_pos, 795 return af9005_write_register_bits(d, xd_g_reg_bw, reg_bw_pos,
@@ -930,7 +930,7 @@ static int af9005_fe_init(struct dvb_frontend *fe)
930 if (ret) 930 if (ret)
931 return ret; 931 return ret;
932 932
933 /* init other parameters: program cfoe and select bandwith */ 933 /* init other parameters: program cfoe and select bandwidth */
934 deb_info("program cfoe\n"); 934 deb_info("program cfoe\n");
935 if ((ret = af9005_fe_program_cfoe(state->d, BANDWIDTH_6_MHZ))) 935 if ((ret = af9005_fe_program_cfoe(state->d, BANDWIDTH_6_MHZ)))
936 return ret; 936 return ret;
@@ -1167,7 +1167,7 @@ static int af9005_fe_set_frontend(struct dvb_frontend *fe,
1167 if (ret) 1167 if (ret)
1168 return ret; 1168 return ret;
1169 1169
1170 /* select bandwith */ 1170 /* select bandwidth */
1171 deb_info("select bandwidth"); 1171 deb_info("select bandwidth");
1172 ret = af9005_fe_select_bw(state->d, fep->u.ofdm.bandwidth); 1172 ret = af9005_fe_select_bw(state->d, fep->u.ofdm.bandwidth);
1173 if (ret) 1173 if (ret)
diff --git a/drivers/media/dvb/dvb-usb/friio.h b/drivers/media/dvb/dvb-usb/friio.h
index af8d55e390fb..0f461ca10cb9 100644
--- a/drivers/media/dvb/dvb-usb/friio.h
+++ b/drivers/media/dvb/dvb-usb/friio.h
@@ -20,7 +20,7 @@
20 * Frontend: comtech JDVBT-90502 20 * Frontend: comtech JDVBT-90502
21 * (tuner PLL: tua6034, I2C addr:(0xC0 >> 1)) 21 * (tuner PLL: tua6034, I2C addr:(0xC0 >> 1))
22 * (OFDM demodulator: TC90502, I2C addr:(0x30 >> 1)) 22 * (OFDM demodulator: TC90502, I2C addr:(0x30 >> 1))
23 * LED x3 (+LNB) controll: PIC 16F676 23 * LED x3 (+LNB) control: PIC 16F676
24 * EEPROM: 24C08 24 * EEPROM: 24C08
25 * 25 *
26 * (USB smart card reader: AU9522) 26 * (USB smart card reader: AU9522)
diff --git a/drivers/media/dvb/dvb-usb/lmedm04.c b/drivers/media/dvb/dvb-usb/lmedm04.c
index cd26e7c1536a..f2db01212ca1 100644
--- a/drivers/media/dvb/dvb-usb/lmedm04.c
+++ b/drivers/media/dvb/dvb-usb/lmedm04.c
@@ -321,7 +321,7 @@ static int lme2510_int_read(struct dvb_usb_adapter *adap)
321 lme_int->lme_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP; 321 lme_int->lme_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
322 322
323 usb_submit_urb(lme_int->lme_urb, GFP_ATOMIC); 323 usb_submit_urb(lme_int->lme_urb, GFP_ATOMIC);
324 info("INT Interupt Service Started"); 324 info("INT Interrupt Service Started");
325 325
326 return 0; 326 return 0;
327} 327}
@@ -482,7 +482,7 @@ static int lme2510_msg(struct dvb_usb_device *d,
482 break; 482 break;
483 } 483 }
484 484
485 deb_info(4, "I2C From Interupt Message out(%02x) in(%02x)", 485 deb_info(4, "I2C From Interrupt Message out(%02x) in(%02x)",
486 wbuf[3], rbuf[1]); 486 wbuf[3], rbuf[1]);
487 487
488 } 488 }
@@ -632,11 +632,11 @@ static int lme2510_int_service(struct dvb_usb_adapter *adap)
632 } 632 }
633 d->rc_dev = rc; 633 d->rc_dev = rc;
634 634
635 /* Start the Interupt */ 635 /* Start the Interrupt */
636 ret = lme2510_int_read(adap); 636 ret = lme2510_int_read(adap);
637 if (ret < 0) { 637 if (ret < 0) {
638 rc_unregister_device(rc); 638 rc_unregister_device(rc);
639 info("INT Unable to start Interupt Service"); 639 info("INT Unable to start Interrupt Service");
640 return -ENODEV; 640 return -ENODEV;
641 } 641 }
642 642
@@ -1003,7 +1003,7 @@ static int dm04_lme2510_tuner(struct dvb_usb_adapter *adap)
1003 return -ENODEV; 1003 return -ENODEV;
1004 } 1004 }
1005 1005
1006 /* Start the Interupt & Remote*/ 1006 /* Start the Interrupt & Remote*/
1007 ret = lme2510_int_service(adap); 1007 ret = lme2510_int_service(adap);
1008 1008
1009 return ret; 1009 return ret;
@@ -1171,7 +1171,7 @@ void *lme2510_exit_int(struct dvb_usb_device *d)
1171 usb_kill_urb(st->lme_urb); 1171 usb_kill_urb(st->lme_urb);
1172 usb_free_coherent(d->udev, 5000, st->buffer, 1172 usb_free_coherent(d->udev, 5000, st->buffer,
1173 st->lme_urb->transfer_dma); 1173 st->lme_urb->transfer_dma);
1174 info("Interupt Service Stopped"); 1174 info("Interrupt Service Stopped");
1175 rc_unregister_device(d->rc_dev); 1175 rc_unregister_device(d->rc_dev);
1176 info("Remote Stopped"); 1176 info("Remote Stopped");
1177 } 1177 }
diff --git a/drivers/media/dvb/frontends/atbm8830.h b/drivers/media/dvb/frontends/atbm8830.h
index e8149f393300..024273374bd8 100644
--- a/drivers/media/dvb/frontends/atbm8830.h
+++ b/drivers/media/dvb/frontends/atbm8830.h
@@ -39,7 +39,7 @@ struct atbm8830_config {
39 /* parallel or serial transport stream */ 39 /* parallel or serial transport stream */
40 u8 serial_ts; 40 u8 serial_ts;
41 41
42 /* transport stream clock output only when receving valid stream */ 42 /* transport stream clock output only when receiving valid stream */
43 u8 ts_clk_gated; 43 u8 ts_clk_gated;
44 44
45 /* Decoder sample TS data at rising edge of clock */ 45 /* Decoder sample TS data at rising edge of clock */
diff --git a/drivers/media/dvb/frontends/au8522_dig.c b/drivers/media/dvb/frontends/au8522_dig.c
index 65f6a36dfb21..1d572940e243 100644
--- a/drivers/media/dvb/frontends/au8522_dig.c
+++ b/drivers/media/dvb/frontends/au8522_dig.c
@@ -635,7 +635,7 @@ static int au8522_led_gpio_enable(struct au8522_state *state, int onoff)
635 struct au8522_led_config *led_config = state->config->led_cfg; 635 struct au8522_led_config *led_config = state->config->led_cfg;
636 u8 val; 636 u8 val;
637 637
638 /* bail out if we cant control an LED */ 638 /* bail out if we can't control an LED */
639 if (!led_config || !led_config->gpio_output || 639 if (!led_config || !led_config->gpio_output ||
640 !led_config->gpio_output_enable || !led_config->gpio_output_disable) 640 !led_config->gpio_output_enable || !led_config->gpio_output_disable)
641 return 0; 641 return 0;
@@ -665,7 +665,7 @@ static int au8522_led_ctrl(struct au8522_state *state, int led)
665 struct au8522_led_config *led_config = state->config->led_cfg; 665 struct au8522_led_config *led_config = state->config->led_cfg;
666 int i, ret = 0; 666 int i, ret = 0;
667 667
668 /* bail out if we cant control an LED */ 668 /* bail out if we can't control an LED */
669 if (!led_config || !led_config->gpio_leds || 669 if (!led_config || !led_config->gpio_leds ||
670 !led_config->num_led_states || !led_config->led_states) 670 !led_config->num_led_states || !led_config->led_states)
671 return 0; 671 return 0;
@@ -803,7 +803,7 @@ static int au8522_led_status(struct au8522_state *state, const u16 *snr)
803 int led; 803 int led;
804 u16 strong; 804 u16 strong;
805 805
806 /* bail out if we cant control an LED */ 806 /* bail out if we can't control an LED */
807 if (!led_config) 807 if (!led_config)
808 return 0; 808 return 0;
809 809
diff --git a/drivers/media/dvb/frontends/bcm3510.c b/drivers/media/dvb/frontends/bcm3510.c
index cf5e576dfdcf..8aff5868a5e1 100644
--- a/drivers/media/dvb/frontends/bcm3510.c
+++ b/drivers/media/dvb/frontends/bcm3510.c
@@ -155,7 +155,7 @@ static int bcm3510_hab_send_request(struct bcm3510_state *st, u8 *buf, int len)
155 unsigned long t; 155 unsigned long t;
156 156
157/* Check if any previous HAB request still needs to be serviced by the 157/* Check if any previous HAB request still needs to be serviced by the
158 * Aquisition Processor before sending new request */ 158 * Acquisition Processor before sending new request */
159 if ((ret = bcm3510_readB(st,0xa8,&v)) < 0) 159 if ((ret = bcm3510_readB(st,0xa8,&v)) < 0)
160 return ret; 160 return ret;
161 if (v.HABSTAT_a8.HABR) { 161 if (v.HABSTAT_a8.HABR) {
@@ -361,7 +361,7 @@ static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
361/* Set duration of the initial state of TUNCTL = 3.34 micro Sec */ 361/* Set duration of the initial state of TUNCTL = 3.34 micro Sec */
362 c.TUNCTL_state = 0x40; 362 c.TUNCTL_state = 0x40;
363 363
364/* PRESCALER DEVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */ 364/* PRESCALER DIVIDE RATIO | BC1_2_3_4; (band switch), 1stosc REFERENCE COUNTER REF_S12 and REF_S11 */
365 c.ctl_dat[0].ctrl.size = BITS_8; 365 c.ctl_dat[0].ctrl.size = BITS_8;
366 c.ctl_dat[0].data = 0x80 | bc; 366 c.ctl_dat[0].data = 0x80 | bc;
367 367
@@ -397,7 +397,7 @@ static int bcm3510_tuner_cmd(struct bcm3510_state* st,u8 bc, u16 n, u8 a)
397 c.ctl_dat[7].ctrl.cs0 = 1; 397 c.ctl_dat[7].ctrl.cs0 = 1;
398 c.ctl_dat[7].data = 0x40; 398 c.ctl_dat[7].data = 0x40;
399 399
400/* PRESCALER DEVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */ 400/* PRESCALER DIVIDE RATIO, 2ndosc REFERENCE COUNTER REF_S12 and REF_S11 */
401 c.ctl_dat[8].ctrl.size = BITS_8; 401 c.ctl_dat[8].ctrl.size = BITS_8;
402 c.ctl_dat[8].data = 0x80; 402 c.ctl_dat[8].data = 0x80;
403 403
diff --git a/drivers/media/dvb/frontends/cx22700.c b/drivers/media/dvb/frontends/cx22700.c
index 5fbc0fc37ecd..0142214b0133 100644
--- a/drivers/media/dvb/frontends/cx22700.c
+++ b/drivers/media/dvb/frontends/cx22700.c
@@ -179,7 +179,7 @@ static int cx22700_set_tps (struct cx22700_state *state, struct dvb_ofdm_paramet
179 cx22700_writereg (state, 0x06, val); 179 cx22700_writereg (state, 0x06, val);
180 180
181 cx22700_writereg (state, 0x08, 0x04 | 0x02); /* use user tps parameters */ 181 cx22700_writereg (state, 0x08, 0x04 | 0x02); /* use user tps parameters */
182 cx22700_writereg (state, 0x08, 0x04); /* restart aquisition */ 182 cx22700_writereg (state, 0x08, 0x04); /* restart acquisition */
183 183
184 return 0; 184 return 0;
185} 185}
diff --git a/drivers/media/dvb/frontends/cx22702.c b/drivers/media/dvb/frontends/cx22702.c
index ff6c4983051c..3139558148ba 100644
--- a/drivers/media/dvb/frontends/cx22702.c
+++ b/drivers/media/dvb/frontends/cx22702.c
@@ -55,7 +55,7 @@ MODULE_PARM_DESC(debug, "Enable verbose debug messages");
55 55
56/* Register values to initialise the demod */ 56/* Register values to initialise the demod */
57static const u8 init_tab[] = { 57static const u8 init_tab[] = {
58 0x00, 0x00, /* Stop aquisition */ 58 0x00, 0x00, /* Stop acquisition */
59 0x0B, 0x06, 59 0x0B, 0x06,
60 0x09, 0x01, 60 0x09, 0x01,
61 0x0D, 0x41, 61 0x0D, 0x41,
@@ -310,7 +310,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
310 & 0xfc); 310 & 0xfc);
311 cx22702_writereg(state, 0x0C, 311 cx22702_writereg(state, 0x0C,
312 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40); 312 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);
313 cx22702_writereg(state, 0x00, 0x01); /* Begin aquisition */ 313 cx22702_writereg(state, 0x00, 0x01); /* Begin acquisition */
314 dprintk("%s: Autodetecting\n", __func__); 314 dprintk("%s: Autodetecting\n", __func__);
315 return 0; 315 return 0;
316 } 316 }
@@ -424,7 +424,7 @@ static int cx22702_set_tps(struct dvb_frontend *fe,
424 cx22702_writereg(state, 0x0C, 424 cx22702_writereg(state, 0x0C,
425 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40); 425 (cx22702_readreg(state, 0x0C) & 0xBF) | 0x40);
426 426
427 /* Begin channel aquisition */ 427 /* Begin channel acquisition */
428 cx22702_writereg(state, 0x00, 0x01); 428 cx22702_writereg(state, 0x00, 0x01);
429 429
430 return 0; 430 return 0;
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index 7a1a5bc337d8..bf9c999aa470 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -544,7 +544,7 @@ static int cx24110_set_frontend(struct dvb_frontend* fe, struct dvb_frontend_par
544 cx24110_set_inversion (state, p->inversion); 544 cx24110_set_inversion (state, p->inversion);
545 cx24110_set_fec (state, p->u.qpsk.fec_inner); 545 cx24110_set_fec (state, p->u.qpsk.fec_inner);
546 cx24110_set_symbolrate (state, p->u.qpsk.symbol_rate); 546 cx24110_set_symbolrate (state, p->u.qpsk.symbol_rate);
547 cx24110_writereg(state,0x04,0x05); /* start aquisition */ 547 cx24110_writereg(state,0x04,0x05); /* start acquisition */
548 548
549 return 0; 549 return 0;
550} 550}
diff --git a/drivers/media/dvb/frontends/cx24113.h b/drivers/media/dvb/frontends/cx24113.h
index 5de0f7ffd8d2..01eb7b9c28f4 100644
--- a/drivers/media/dvb/frontends/cx24113.h
+++ b/drivers/media/dvb/frontends/cx24113.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Driver for Conexant CX24113/CX24128 Tuner (Satelite) 2 * Driver for Conexant CX24113/CX24128 Tuner (Satellite)
3 * 3 *
4 * Copyright (C) 2007-8 Patrick Boettcher <pb@linuxtv.org> 4 * Copyright (C) 2007-8 Patrick Boettcher <pb@linuxtv.org>
5 * 5 *
diff --git a/drivers/media/dvb/frontends/cx24123.c b/drivers/media/dvb/frontends/cx24123.c
index fad6a990a39b..b1dd8acc607a 100644
--- a/drivers/media/dvb/frontends/cx24123.c
+++ b/drivers/media/dvb/frontends/cx24123.c
@@ -949,7 +949,7 @@ static int cx24123_set_frontend(struct dvb_frontend *fe,
949 else 949 else
950 err("it seems I don't have a tuner..."); 950 err("it seems I don't have a tuner...");
951 951
952 /* Enable automatic aquisition and reset cycle */ 952 /* Enable automatic acquisition and reset cycle */
953 cx24123_writereg(state, 0x03, (cx24123_readreg(state, 0x03) | 0x07)); 953 cx24123_writereg(state, 0x03, (cx24123_readreg(state, 0x03) | 0x07));
954 cx24123_writereg(state, 0x00, 0x10); 954 cx24123_writereg(state, 0x00, 0x10);
955 cx24123_writereg(state, 0x00, 0); 955 cx24123_writereg(state, 0x00, 0);
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c
index a05007c80985..536f02b17338 100644
--- a/drivers/media/dvb/frontends/drx397xD.c
+++ b/drivers/media/dvb/frontends/drx397xD.c
@@ -1097,7 +1097,7 @@ static int drx397x_init(struct dvb_frontend *fe)
1097 s->config.ifagc.w0A = 0x3ff; 1097 s->config.ifagc.w0A = 0x3ff;
1098 s->config.ifagc.w0C = 0x388; 1098 s->config.ifagc.w0C = 0x388;
1099 1099
1100 /* for signal strenght calculations */ 1100 /* for signal strength calculations */
1101 s->config.ss76 = 820; 1101 s->config.ss76 = 820;
1102 s->config.ss78 = 2200; 1102 s->config.ss78 = 2200;
1103 s->config.ss7A = 150; 1103 s->config.ss7A = 150;
diff --git a/drivers/media/dvb/frontends/mb86a16.c b/drivers/media/dvb/frontends/mb86a16.c
index 33b63235b86e..c283112051b1 100644
--- a/drivers/media/dvb/frontends/mb86a16.c
+++ b/drivers/media/dvb/frontends/mb86a16.c
@@ -1630,7 +1630,7 @@ static enum dvbfe_search mb86a16_search(struct dvb_frontend *fe,
1630 state->srate = p->u.qpsk.symbol_rate / 1000; 1630 state->srate = p->u.qpsk.symbol_rate / 1000;
1631 1631
1632 if (!mb86a16_set_fe(state)) { 1632 if (!mb86a16_set_fe(state)) {
1633 dprintk(verbose, MB86A16_ERROR, 1, "Succesfully acquired LOCK"); 1633 dprintk(verbose, MB86A16_ERROR, 1, "Successfully acquired LOCK");
1634 return DVBFE_ALGO_SEARCH_SUCCESS; 1634 return DVBFE_ALGO_SEARCH_SUCCESS;
1635 } 1635 }
1636 1636
diff --git a/drivers/media/dvb/frontends/mb86a20s.c b/drivers/media/dvb/frontends/mb86a20s.c
index cc4acd2f920d..0f867a5055fb 100644
--- a/drivers/media/dvb/frontends/mb86a20s.c
+++ b/drivers/media/dvb/frontends/mb86a20s.c
@@ -406,7 +406,7 @@ err:
406 printk(KERN_INFO "mb86a20s: Init failed. Will try again later\n"); 406 printk(KERN_INFO "mb86a20s: Init failed. Will try again later\n");
407 } else { 407 } else {
408 state->need_init = false; 408 state->need_init = false;
409 dprintk("Initialization succeded.\n"); 409 dprintk("Initialization succeeded.\n");
410 } 410 }
411 return rc; 411 return rc;
412} 412}
diff --git a/drivers/media/dvb/frontends/mt312.c b/drivers/media/dvb/frontends/mt312.c
index 472907d43460..83e6f1a1b700 100644
--- a/drivers/media/dvb/frontends/mt312.c
+++ b/drivers/media/dvb/frontends/mt312.c
@@ -670,7 +670,7 @@ static int mt312_i2c_gate_ctrl(struct dvb_frontend *fe, int enable)
670 if (ret < 0) 670 if (ret < 0)
671 goto error; 671 goto error;
672 672
673 /* preserve this bit to not accidently shutdown ADC */ 673 /* preserve this bit to not accidentally shutdown ADC */
674 val &= 0x80; 674 val &= 0x80;
675 break; 675 break;
676 } 676 }
diff --git a/drivers/media/dvb/frontends/s5h1420.c b/drivers/media/dvb/frontends/s5h1420.c
index e87b747ea99c..17f8cdf8afef 100644
--- a/drivers/media/dvb/frontends/s5h1420.c
+++ b/drivers/media/dvb/frontends/s5h1420.c
@@ -225,7 +225,7 @@ static int s5h1420_recv_slave_reply (struct dvb_frontend* fe,
225 unsigned long timeout; 225 unsigned long timeout;
226 int result = 0; 226 int result = 0;
227 227
228 /* setup for DISEQC recieve */ 228 /* setup for DISEQC receive */
229 val = s5h1420_readreg(state, 0x3b); 229 val = s5h1420_readreg(state, 0x3b);
230 s5h1420_writereg(state, 0x3b, 0x82); /* FIXME: guess - do we need to set DIS_RDY(0x08) in receive mode? */ 230 s5h1420_writereg(state, 0x3b, 0x82); /* FIXME: guess - do we need to set DIS_RDY(0x08) in receive mode? */
231 msleep(15); 231 msleep(15);
diff --git a/drivers/media/dvb/frontends/stb6100.c b/drivers/media/dvb/frontends/stb6100.c
index 64673b8b64a2..bc1a8af4f6e1 100644
--- a/drivers/media/dvb/frontends/stb6100.c
+++ b/drivers/media/dvb/frontends/stb6100.c
@@ -360,7 +360,7 @@ static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
360 else 360 else
361 odiv = 0; 361 odiv = 0;
362 362
363 /* VCO enabled, seach clock off as per LL3.7, 3.4.1 */ 363 /* VCO enabled, search clock off as per LL3.7, 3.4.1 */
364 regs[STB6100_VCO] = 0xe0 | (odiv << STB6100_VCO_ODIV_SHIFT); 364 regs[STB6100_VCO] = 0xe0 | (odiv << STB6100_VCO_ODIV_SHIFT);
365 365
366 /* OSM */ 366 /* OSM */
diff --git a/drivers/media/dvb/frontends/stv0297.c b/drivers/media/dvb/frontends/stv0297.c
index 4fd7479bb62b..84d88f33275e 100644
--- a/drivers/media/dvb/frontends/stv0297.c
+++ b/drivers/media/dvb/frontends/stv0297.c
@@ -435,7 +435,7 @@ static int stv0297_set_frontend(struct dvb_frontend *fe, struct dvb_frontend_par
435 return -EINVAL; 435 return -EINVAL;
436 } 436 }
437 437
438 // determine inversion dependant parameters 438 // determine inversion dependent parameters
439 inversion = p->inversion; 439 inversion = p->inversion;
440 if (state->config->invert) 440 if (state->config->invert)
441 inversion = (inversion == INVERSION_ON) ? INVERSION_OFF : INVERSION_ON; 441 inversion = (inversion == INVERSION_ON) ? INVERSION_OFF : INVERSION_ON;
diff --git a/drivers/media/dvb/frontends/stv0367.c b/drivers/media/dvb/frontends/stv0367.c
index 4e0e6a873b8c..e57ab53e2e27 100644
--- a/drivers/media/dvb/frontends/stv0367.c
+++ b/drivers/media/dvb/frontends/stv0367.c
@@ -1328,7 +1328,7 @@ stv0367_ter_signal_type stv0367ter_lock_algo(struct stv0367_state *state)
1328 1328
1329 /*guard=stv0367_readbits(state,F367TER_SYR_GUARD); */ 1329 /*guard=stv0367_readbits(state,F367TER_SYR_GUARD); */
1330 1330
1331 /*supress EPQ auto for SYR_GARD 1/16 or 1/32 1331 /*suppress EPQ auto for SYR_GARD 1/16 or 1/32
1332 and set channel predictor in automatic */ 1332 and set channel predictor in automatic */
1333#if 0 1333#if 0
1334 switch (guard) { 1334 switch (guard) {
diff --git a/drivers/media/dvb/frontends/stv0900_priv.h b/drivers/media/dvb/frontends/stv0900_priv.h
index b62b0f0a4fef..e0ea74c8e093 100644
--- a/drivers/media/dvb/frontends/stv0900_priv.h
+++ b/drivers/media/dvb/frontends/stv0900_priv.h
@@ -238,7 +238,7 @@ enum fe_stv0900_demod_mode {
238}; 238};
239 239
240struct stv0900_init_params{ 240struct stv0900_init_params{
241 u32 dmd_ref_clk;/* Refrence,Input clock for the demod in Hz */ 241 u32 dmd_ref_clk;/* Reference,Input clock for the demod in Hz */
242 242
243 /* Demodulator Type (single demod or dual demod) */ 243 /* Demodulator Type (single demod or dual demod) */
244 enum fe_stv0900_demod_mode demod_mode; 244 enum fe_stv0900_demod_mode demod_mode;
diff --git a/drivers/media/dvb/frontends/stv090x.c b/drivers/media/dvb/frontends/stv090x.c
index 41d0f0a6655d..52d8712411e5 100644
--- a/drivers/media/dvb/frontends/stv090x.c
+++ b/drivers/media/dvb/frontends/stv090x.c
@@ -1424,7 +1424,7 @@ static int stv090x_start_search(struct stv090x_state *state)
1424 if (STV090x_WRITE_DEMOD(state, CFRLOW0, 0x00) < 0) 1424 if (STV090x_WRITE_DEMOD(state, CFRLOW0, 0x00) < 0)
1425 goto err; 1425 goto err;
1426 1426
1427 /*enlarge the timing bandwith for Low SR*/ 1427 /*enlarge the timing bandwidth for Low SR*/
1428 if (STV090x_WRITE_DEMOD(state, RTCS2, 0x68) < 0) 1428 if (STV090x_WRITE_DEMOD(state, RTCS2, 0x68) < 0)
1429 goto err; 1429 goto err;
1430 } else { 1430 } else {
@@ -1432,17 +1432,17 @@ static int stv090x_start_search(struct stv090x_state *state)
1432 Set The carrier search up and low to auto mode */ 1432 Set The carrier search up and low to auto mode */
1433 if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0) 1433 if (STV090x_WRITE_DEMOD(state, CARCFG, 0xc4) < 0)
1434 goto err; 1434 goto err;
1435 /*reduce the timing bandwith for high SR*/ 1435 /*reduce the timing bandwidth for high SR*/
1436 if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0) 1436 if (STV090x_WRITE_DEMOD(state, RTCS2, 0x44) < 0)
1437 goto err; 1437 goto err;
1438 } 1438 }
1439 } else { 1439 } else {
1440 /* >= Cut 3 */ 1440 /* >= Cut 3 */
1441 if (state->srate <= 5000000) { 1441 if (state->srate <= 5000000) {
1442 /* enlarge the timing bandwith for Low SR */ 1442 /* enlarge the timing bandwidth for Low SR */
1443 STV090x_WRITE_DEMOD(state, RTCS2, 0x68); 1443 STV090x_WRITE_DEMOD(state, RTCS2, 0x68);
1444 } else { 1444 } else {
1445 /* reduce timing bandwith for high SR */ 1445 /* reduce timing bandwidth for high SR */
1446 STV090x_WRITE_DEMOD(state, RTCS2, 0x44); 1446 STV090x_WRITE_DEMOD(state, RTCS2, 0x44);
1447 } 1447 }
1448 1448
@@ -2482,7 +2482,7 @@ static int stv090x_sw_algo(struct stv090x_state *state)
2482 dvbs2_fly_wheel = STV090x_GETFIELD_Px(reg, FLYWHEEL_CPT_FIELD); 2482 dvbs2_fly_wheel = STV090x_GETFIELD_Px(reg, FLYWHEEL_CPT_FIELD);
2483 } 2483 }
2484 if (dvbs2_fly_wheel < 0xd) { 2484 if (dvbs2_fly_wheel < 0xd) {
2485 /*FALSE lock, The demod is loosing lock */ 2485 /*FALSE lock, The demod is losing lock */
2486 lock = 0; 2486 lock = 0;
2487 if (trials < 2) { 2487 if (trials < 2) {
2488 if (state->internal->dev_ver >= 0x20) { 2488 if (state->internal->dev_ver >= 0x20) {
@@ -3202,7 +3202,7 @@ static enum stv090x_signal_state stv090x_algo(struct stv090x_state *state)
3202 goto err; 3202 goto err;
3203 if (STV090x_WRITE_DEMOD(state, CORRELMANT, 0x70) < 0) 3203 if (STV090x_WRITE_DEMOD(state, CORRELMANT, 0x70) < 0)
3204 goto err; 3204 goto err;
3205 if (stv090x_set_srate(state, 1000000) < 0) /* inital srate = 1Msps */ 3205 if (stv090x_set_srate(state, 1000000) < 0) /* initial srate = 1Msps */
3206 goto err; 3206 goto err;
3207 } else { 3207 } else {
3208 /* known srate */ 3208 /* known srate */
diff --git a/drivers/media/dvb/mantis/mantis_uart.c b/drivers/media/dvb/mantis/mantis_uart.c
index 97b889e8a341..f807c8ba26e4 100644
--- a/drivers/media/dvb/mantis/mantis_uart.c
+++ b/drivers/media/dvb/mantis/mantis_uart.c
@@ -172,7 +172,7 @@ int mantis_uart_init(struct mantis_pci *mantis)
172 mmwrite(mmread(MANTIS_UART_CTL) | MANTIS_UART_RXINT, MANTIS_UART_CTL); 172 mmwrite(mmread(MANTIS_UART_CTL) | MANTIS_UART_RXINT, MANTIS_UART_CTL);
173 173
174 schedule_work(&mantis->uart_work); 174 schedule_work(&mantis->uart_work);
175 dprintk(MANTIS_DEBUG, 1, "UART succesfully initialized"); 175 dprintk(MANTIS_DEBUG, 1, "UART successfully initialized");
176 176
177 return 0; 177 return 0;
178} 178}
diff --git a/drivers/media/dvb/ngene/ngene-core.c b/drivers/media/dvb/ngene/ngene-core.c
index 175a0f6c2a4c..ccc2d1af49d4 100644
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
@@ -122,7 +122,7 @@ static void demux_tasklet(unsigned long data)
122 Cur->ngeneBuffer.SR.Flags &= 122 Cur->ngeneBuffer.SR.Flags &=
123 ~0x40; 123 ~0x40;
124 break; 124 break;
125 /* Stop proccessing stream */ 125 /* Stop processing stream */
126 } 126 }
127 } else { 127 } else {
128 /* We got a valid buffer, 128 /* We got a valid buffer,
@@ -133,7 +133,7 @@ static void demux_tasklet(unsigned long data)
133 printk(KERN_ERR DEVICE_NAME ": OOPS\n"); 133 printk(KERN_ERR DEVICE_NAME ": OOPS\n");
134 if (chan->HWState == HWSTATE_RUN) { 134 if (chan->HWState == HWSTATE_RUN) {
135 Cur->ngeneBuffer.SR.Flags &= ~0x40; 135 Cur->ngeneBuffer.SR.Flags &= ~0x40;
136 break; /* Stop proccessing stream */ 136 break; /* Stop processing stream */
137 } 137 }
138 } 138 }
139 if (chan->AudioDTOUpdated) { 139 if (chan->AudioDTOUpdated) {
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index 6ca6713d527a..7cb79ec685f0 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -294,13 +294,13 @@ static void pluto_dma_end(struct pluto *pluto, unsigned int nbpackets)
294 294
295 /* Workaround for broken hardware: 295 /* Workaround for broken hardware:
296 * [1] On startup NBPACKETS seems to contain an uninitialized value, 296 * [1] On startup NBPACKETS seems to contain an uninitialized value,
297 * but no packets have been transfered. 297 * but no packets have been transferred.
298 * [2] Sometimes (actually very often) NBPACKETS stays at zero 298 * [2] Sometimes (actually very often) NBPACKETS stays at zero
299 * although one packet has been transfered. 299 * although one packet has been transferred.
300 * [3] Sometimes (actually rarely), the card gets into an erroneous 300 * [3] Sometimes (actually rarely), the card gets into an erroneous
301 * mode where it continuously generates interrupts, claiming it 301 * mode where it continuously generates interrupts, claiming it
302 * has recieved nbpackets>TS_DMA_PACKETS packets, but no packet 302 * has received nbpackets>TS_DMA_PACKETS packets, but no packet
303 * has been transfered. Only a reset seems to solve this 303 * has been transferred. Only a reset seems to solve this
304 */ 304 */
305 if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) { 305 if ((nbpackets == 0) || (nbpackets > TS_DMA_PACKETS)) {
306 unsigned int i = 0; 306 unsigned int i = 0;
@@ -332,7 +332,7 @@ static irqreturn_t pluto_irq(int irq, void *dev_id)
332 struct pluto *pluto = dev_id; 332 struct pluto *pluto = dev_id;
333 u32 tscr; 333 u32 tscr;
334 334
335 /* check whether an interrupt occured on this device */ 335 /* check whether an interrupt occurred on this device */
336 tscr = pluto_readreg(pluto, REG_TSCR); 336 tscr = pluto_readreg(pluto, REG_TSCR);
337 if (!(tscr & (TSCR_DE | TSCR_OVR))) 337 if (!(tscr & (TSCR_DE | TSCR_OVR)))
338 return IRQ_NONE; 338 return IRQ_NONE;
diff --git a/drivers/media/dvb/siano/smsdvb.c b/drivers/media/dvb/siano/smsdvb.c
index b80d09b035a1..37c594f82782 100644
--- a/drivers/media/dvb/siano/smsdvb.c
+++ b/drivers/media/dvb/siano/smsdvb.c
@@ -650,7 +650,7 @@ static int smsdvb_dvbt_set_frontend(struct dvb_frontend *fe,
650 if (status & FE_HAS_LOCK) 650 if (status & FE_HAS_LOCK)
651 return ret; 651 return ret;
652 652
653 /* previous tune didnt lock - enable LNA and tune again */ 653 /* previous tune didn't lock - enable LNA and tune again */
654 sms_board_lna_control(client->coredev, 1); 654 sms_board_lna_control(client->coredev, 1);
655 } 655 }
656 656
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index fc0a60f8a1e1..3d20719fce1a 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2332,7 +2332,7 @@ static int frontend_init(struct av7110 *av7110)
2332 * increment. That's how the 7146 is programmed to do event 2332 * increment. That's how the 7146 is programmed to do event
2333 * counting in this budget-patch.c 2333 * counting in this budget-patch.c
2334 * I *think* HPS setting has something to do with the phase 2334 * I *think* HPS setting has something to do with the phase
2335 * of HS but I cant be 100% sure in that. 2335 * of HS but I can't be 100% sure in that.
2336 * 2336 *
2337 * hardware debug note: a working budget card (including budget patch) 2337 * hardware debug note: a working budget card (including budget patch)
2338 * with vpeirq() interrupt setup in mode "0x90" (every 64K) will 2338 * with vpeirq() interrupt setup in mode "0x90" (every 64K) will
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 579835590690..3395d1a90516 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -539,7 +539,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
539** increment. That's how the 7146 is programmed to do event 539** increment. That's how the 7146 is programmed to do event
540** counting in this budget-patch.c 540** counting in this budget-patch.c
541** I *think* HPS setting has something to do with the phase 541** I *think* HPS setting has something to do with the phase
542** of HS but I cant be 100% sure in that. 542** of HS but I can't be 100% sure in that.
543 543
544** hardware debug note: a working budget card (including budget patch) 544** hardware debug note: a working budget card (including budget patch)
545** with vpeirq() interrupt setup in mode "0x90" (every 64K) will 545** with vpeirq() interrupt setup in mode "0x90" (every 64K) will
diff --git a/drivers/media/dvb/ttusb-dec/ttusb_dec.c b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
index fe1b8037b247..f893bffa08a3 100644
--- a/drivers/media/dvb/ttusb-dec/ttusb_dec.c
+++ b/drivers/media/dvb/ttusb-dec/ttusb_dec.c
@@ -234,7 +234,7 @@ static void ttusb_dec_handle_irq( struct urb *urb)
234 * (with buffer[3] == 0x40) in an intervall of ~100ms. 234 * (with buffer[3] == 0x40) in an intervall of ~100ms.
235 * But to handle this correctly we had to imlemenent some 235 * But to handle this correctly we had to imlemenent some
236 * kind of timer which signals a 'key up' event if no 236 * kind of timer which signals a 'key up' event if no
237 * keyrepeat signal is recieved for lets say 200ms. 237 * keyrepeat signal is received for lets say 200ms.
238 * this should/could be added later ... 238 * this should/could be added later ...
239 * for now lets report each signal as a key down and up*/ 239 * for now lets report each signal as a key down and up*/
240 dprintk("%s:rc signal:%d\n", __func__, buffer[4]); 240 dprintk("%s:rc signal:%d\n", __func__, buffer[4]);