aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/common/saa7146_i2c.c2
-rw-r--r--drivers/media/dvb/dvb-core/dvb_frontend.h2
-rw-r--r--drivers/media/dvb/dvb-usb/anysee.c2
-rw-r--r--drivers/media/dvb/dvb-usb/dibusb-mb.c2
-rw-r--r--drivers/media/dvb/dvb-usb/dvb-usb-remote.c2
-rw-r--r--drivers/media/dvb/dvb-usb/usb-urb.c4
-rw-r--r--drivers/media/dvb/frontends/au8522_decoder.c2
-rw-r--r--drivers/media/dvb/frontends/cx24110.c4
-rw-r--r--drivers/media/dvb/frontends/cx24113.c2
-rw-r--r--drivers/media/dvb/frontends/dib3000mb.c2
-rw-r--r--drivers/media/dvb/frontends/lgdt330x.c4
-rw-r--r--drivers/media/dvb/frontends/stb0899_drv.c2
-rw-r--r--drivers/media/dvb/ttpci/av7110.c4
-rw-r--r--drivers/media/dvb/ttpci/budget-patch.c2
-rw-r--r--drivers/media/radio/radio-mr800.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx-avcore.c8
-rw-r--r--drivers/media/video/cx23885/cx23885-dvb.c2
-rw-r--r--drivers/media/video/cx88/cx88-core.c2
-rw-r--r--drivers/media/video/davinci/dm355_ccdc.c2
-rw-r--r--drivers/media/video/davinci/vpss.c2
-rw-r--r--drivers/media/video/gspca/sonixb.c2
-rw-r--r--drivers/media/video/gspca/spca500.c2
-rw-r--r--drivers/media/video/gspca/spca501.c6
-rw-r--r--drivers/media/video/gspca/sunplus.c2
-rw-r--r--drivers/media/video/gspca/zc3xx.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h2
-rw-r--r--drivers/media/video/s2255drv.c2
-rw-r--r--drivers/media/video/zoran/zoran.h2
28 files changed, 38 insertions, 36 deletions
diff --git a/drivers/media/common/saa7146_i2c.c b/drivers/media/common/saa7146_i2c.c
index 7e8f56815998..48cb154c7a46 100644
--- a/drivers/media/common/saa7146_i2c.c
+++ b/drivers/media/common/saa7146_i2c.c
@@ -98,7 +98,7 @@ static int saa7146_i2c_msg_cleanup(const struct i2c_msg *m, int num, __le32 *op)
98 98
99 op_count++; 99 op_count++;
100 100
101 /* loop throgh all bytes of message i */ 101 /* loop through all bytes of message i */
102 for(j = 0; j < m[i].len; j++) { 102 for(j = 0; j < m[i].len; j++) {
103 /* write back all bytes that could have been read */ 103 /* write back all bytes that could have been read */
104 m[i].buf[j] = (le32_to_cpu(op[op_count/3]) >> ((3-(op_count%3))*8)); 104 m[i].buf[j] = (le32_to_cpu(op[op_count/3]) >> ((3-(op_count%3))*8));
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 810f07d63246..52e4ce4304ee 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -160,7 +160,7 @@ struct tuner_state {
160 * search callback possible return status 160 * search callback possible return status
161 * 161 *
162 * DVBFE_ALGO_SEARCH_SUCCESS 162 * DVBFE_ALGO_SEARCH_SUCCESS
163 * The frontend search algorithm completed and returned succesfully 163 * The frontend search algorithm completed and returned successfully
164 * 164 *
165 * DVBFE_ALGO_SEARCH_ASLEEP 165 * DVBFE_ALGO_SEARCH_ASLEEP
166 * The frontend search algorithm is sleeping 166 * The frontend search algorithm is sleeping
diff --git a/drivers/media/dvb/dvb-usb/anysee.c b/drivers/media/dvb/dvb-usb/anysee.c
index 2ae7f648effe..bb69f3719f9a 100644
--- a/drivers/media/dvb/dvb-usb/anysee.c
+++ b/drivers/media/dvb/dvb-usb/anysee.c
@@ -344,7 +344,7 @@ static int anysee_frontend_attach(struct dvb_usb_adapter *adap)
344 if (ret) 344 if (ret)
345 return ret; 345 return ret;
346 346
347 err("Unkown Anysee version: %02x %02x %02x. "\ 347 err("Unknown Anysee version: %02x %02x %02x. "\
348 "Please report the <linux-dvb@linuxtv.org>.", 348 "Please report the <linux-dvb@linuxtv.org>.",
349 hw_info[0], hw_info[1], hw_info[2]); 349 hw_info[0], hw_info[1], hw_info[2]);
350 350
diff --git a/drivers/media/dvb/dvb-usb/dibusb-mb.c b/drivers/media/dvb/dvb-usb/dibusb-mb.c
index eeef50bff4f9..5c0126dc1ff9 100644
--- a/drivers/media/dvb/dvb-usb/dibusb-mb.c
+++ b/drivers/media/dvb/dvb-usb/dibusb-mb.c
@@ -242,7 +242,7 @@ static struct dvb_usb_device_properties dibusb1_1_properties = {
242 { &dibusb_dib3000mb_table[9], &dibusb_dib3000mb_table[11], NULL }, 242 { &dibusb_dib3000mb_table[9], &dibusb_dib3000mb_table[11], NULL },
243 { &dibusb_dib3000mb_table[10], &dibusb_dib3000mb_table[12], NULL }, 243 { &dibusb_dib3000mb_table[10], &dibusb_dib3000mb_table[12], NULL },
244 }, 244 },
245 { "Unkown USB1.1 DVB-T device ???? please report the name to the author", 245 { "Unknown USB1.1 DVB-T device ???? please report the name to the author",
246 { &dibusb_dib3000mb_table[13], NULL }, 246 { &dibusb_dib3000mb_table[13], NULL },
247 { &dibusb_dib3000mb_table[14], NULL }, 247 { &dibusb_dib3000mb_table[14], NULL },
248 }, 248 },
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
index edde87c6aa3a..6b5ded9e7d5d 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-remote.c
@@ -259,7 +259,7 @@ int dvb_usb_nec_rc_key_to_event(struct dvb_usb_device *d,
259 *state = REMOTE_KEY_REPEAT; 259 *state = REMOTE_KEY_REPEAT;
260 break; 260 break;
261 default: 261 default:
262 deb_err("unkown type of remote status: %d\n",keybuf[0]); 262 deb_err("unknown type of remote status: %d\n",keybuf[0]);
263 break; 263 break;
264 } 264 }
265 return 0; 265 return 0;
diff --git a/drivers/media/dvb/dvb-usb/usb-urb.c b/drivers/media/dvb/dvb-usb/usb-urb.c
index 9da2cc95ca13..f9702e3756b6 100644
--- a/drivers/media/dvb/dvb-usb/usb-urb.c
+++ b/drivers/media/dvb/dvb-usb/usb-urb.c
@@ -56,7 +56,7 @@ static void usb_urb_complete(struct urb *urb)
56 stream->complete(stream, b, urb->actual_length); 56 stream->complete(stream, b, urb->actual_length);
57 break; 57 break;
58 default: 58 default:
59 err("unkown endpoint type in completition handler."); 59 err("unknown endpoint type in completition handler.");
60 return; 60 return;
61 } 61 }
62 usb_submit_urb(urb,GFP_ATOMIC); 62 usb_submit_urb(urb,GFP_ATOMIC);
@@ -228,7 +228,7 @@ int usb_urb_init(struct usb_data_stream *stream, struct usb_data_stream_properti
228 case USB_ISOC: 228 case USB_ISOC:
229 return usb_isoc_urb_init(stream); 229 return usb_isoc_urb_init(stream);
230 default: 230 default:
231 err("unkown URB-type for data transfer."); 231 err("unknown URB-type for data transfer.");
232 return -EINVAL; 232 return -EINVAL;
233 } 233 }
234} 234}
diff --git a/drivers/media/dvb/frontends/au8522_decoder.c b/drivers/media/dvb/frontends/au8522_decoder.c
index 74981ee923c8..7c6431fe33e0 100644
--- a/drivers/media/dvb/frontends/au8522_decoder.c
+++ b/drivers/media/dvb/frontends/au8522_decoder.c
@@ -315,7 +315,7 @@ static void setup_decoder_defaults(struct au8522_state *state, u8 input_mode)
315 if (input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13 || 315 if (input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH13 ||
316 input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24) { 316 input_mode == AU8522_INPUT_CONTROL_REG081H_SVIDEO_CH24) {
317 /* Despite what the table says, for the HVR-950q we still need 317 /* Despite what the table says, for the HVR-950q we still need
318 to be in CVBS mode for the S-Video input (reason uknown). */ 318 to be in CVBS mode for the S-Video input (reason unknown). */
319 /* filter_coef_type = 3; */ 319 /* filter_coef_type = 3; */
320 filter_coef_type = 5; 320 filter_coef_type = 5;
321 } else { 321 } else {
diff --git a/drivers/media/dvb/frontends/cx24110.c b/drivers/media/dvb/frontends/cx24110.c
index ffbcfabd83f0..00a4e8f03304 100644
--- a/drivers/media/dvb/frontends/cx24110.c
+++ b/drivers/media/dvb/frontends/cx24110.c
@@ -1,4 +1,4 @@
1 /* 1/*
2 cx24110 - Single Chip Satellite Channel Receiver driver module 2 cx24110 - Single Chip Satellite Channel Receiver driver module
3 3
4 Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@htp-tel.de> based on 4 Copyright (C) 2002 Peter Hettkamp <peter.hettkamp@htp-tel.de> based on
@@ -96,7 +96,7 @@ static struct {u8 reg; u8 data;} cx24110_regdata[]=
96 {0x42,0x00}, /* @ middle bytes " */ 96 {0x42,0x00}, /* @ middle bytes " */
97 {0x43,0x00}, /* @ LSB " */ 97 {0x43,0x00}, /* @ LSB " */
98 /* leave the carrier tracking loop parameters on default */ 98 /* leave the carrier tracking loop parameters on default */
99 /* leave the bit timing loop parameters at gefault */ 99 /* leave the bit timing loop parameters at default */
100 {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */ 100 {0x56,0x4d}, /* set the filtune voltage to 2.7V, as recommended by */
101 /* the cx24108 data sheet for symbol rates above 15MS/s */ 101 /* the cx24108 data sheet for symbol rates above 15MS/s */
102 {0x57,0x00}, /* @ Filter sigma delta enabled, positive */ 102 {0x57,0x00}, /* @ Filter sigma delta enabled, positive */
diff --git a/drivers/media/dvb/frontends/cx24113.c b/drivers/media/dvb/frontends/cx24113.c
index 075b2b57cf09..e9ee55592fd3 100644
--- a/drivers/media/dvb/frontends/cx24113.c
+++ b/drivers/media/dvb/frontends/cx24113.c
@@ -589,7 +589,7 @@ struct dvb_frontend *cx24113_attach(struct dvb_frontend *fe,
589 info("detected CX24113 variant\n"); 589 info("detected CX24113 variant\n");
590 break; 590 break;
591 case REV_CX24113: 591 case REV_CX24113:
592 info("sucessfully detected\n"); 592 info("successfully detected\n");
593 break; 593 break;
594 default: 594 default:
595 err("unsupported device id: %x\n", state->rev); 595 err("unsupported device id: %x\n", state->rev);
diff --git a/drivers/media/dvb/frontends/dib3000mb.c b/drivers/media/dvb/frontends/dib3000mb.c
index 136b9d2164d7..ad4c8cfd8090 100644
--- a/drivers/media/dvb/frontends/dib3000mb.c
+++ b/drivers/media/dvb/frontends/dib3000mb.c
@@ -154,7 +154,7 @@ static int dib3000mb_set_frontend(struct dvb_frontend* fe,
154 case BANDWIDTH_AUTO: 154 case BANDWIDTH_AUTO:
155 return -EOPNOTSUPP; 155 return -EOPNOTSUPP;
156 default: 156 default:
157 err("unkown bandwidth value."); 157 err("unknown bandwidth value.");
158 return -EINVAL; 158 return -EINVAL;
159 } 159 }
160 } 160 }
diff --git a/drivers/media/dvb/frontends/lgdt330x.c b/drivers/media/dvb/frontends/lgdt330x.c
index 056387b41a8f..43971e63baa7 100644
--- a/drivers/media/dvb/frontends/lgdt330x.c
+++ b/drivers/media/dvb/frontends/lgdt330x.c
@@ -479,7 +479,7 @@ static int lgdt3302_read_status(struct dvb_frontend* fe, fe_status_t* status)
479 switch (state->current_modulation) { 479 switch (state->current_modulation) {
480 case QAM_256: 480 case QAM_256:
481 case QAM_64: 481 case QAM_64:
482 /* Need to undestand why there are 3 lock levels here */ 482 /* Need to understand why there are 3 lock levels here */
483 if ((buf[0] & 0x07) == 0x07) 483 if ((buf[0] & 0x07) == 0x07)
484 *status |= FE_HAS_CARRIER; 484 *status |= FE_HAS_CARRIER;
485 break; 485 break;
@@ -520,7 +520,7 @@ static int lgdt3303_read_status(struct dvb_frontend* fe, fe_status_t* status)
520 switch (state->current_modulation) { 520 switch (state->current_modulation) {
521 case QAM_256: 521 case QAM_256:
522 case QAM_64: 522 case QAM_64:
523 /* Need to undestand why there are 3 lock levels here */ 523 /* Need to understand why there are 3 lock levels here */
524 if ((buf[0] & 0x07) == 0x07) 524 if ((buf[0] & 0x07) == 0x07)
525 *status |= FE_HAS_CARRIER; 525 *status |= FE_HAS_CARRIER;
526 else 526 else
diff --git a/drivers/media/dvb/frontends/stb0899_drv.c b/drivers/media/dvb/frontends/stb0899_drv.c
index a04c782fff8d..1570669837ea 100644
--- a/drivers/media/dvb/frontends/stb0899_drv.c
+++ b/drivers/media/dvb/frontends/stb0899_drv.c
@@ -1571,7 +1571,7 @@ static enum dvbfe_search stb0899_search(struct dvb_frontend *fe, struct dvb_fron
1571 * stb0899_track 1571 * stb0899_track
1572 * periodically check the signal level against a specified 1572 * periodically check the signal level against a specified
1573 * threshold level and perform derotator centering. 1573 * threshold level and perform derotator centering.
1574 * called once we have a lock from a succesful search 1574 * called once we have a lock from a successful search
1575 * event. 1575 * event.
1576 * 1576 *
1577 * Will be called periodically called to maintain the 1577 * Will be called periodically called to maintain the
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index 8d65c652ba50..baf3159a3aa6 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -2425,7 +2425,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
2425 * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called 2425 * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called
2426 */ 2426 */
2427 saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); 2427 saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
2428 /* set event counter 1 treshold to maximum allowed value (rEC p55) */ 2428 /* set event counter 1 threshold to maximum allowed value (rEC p55) */
2429 saa7146_write(dev, ECT1R, 0x3fff ); 2429 saa7146_write(dev, ECT1R, 0x3fff );
2430#endif 2430#endif
2431 /* Set RPS1 Address register to point to RPS code (r108 p42) */ 2431 /* Set RPS1 Address register to point to RPS code (r108 p42) */
@@ -2559,7 +2559,7 @@ static int __devinit av7110_attach(struct saa7146_dev* dev,
2559 * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called 2559 * use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called
2560 */ 2560 */
2561 saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); 2561 saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
2562 /* set event counter 1 treshold to maximum allowed value (rEC p55) */ 2562 /* set event counter 1 threshold to maximum allowed value (rEC p55) */
2563 saa7146_write(dev, ECT1R, 0x3fff ); 2563 saa7146_write(dev, ECT1R, 0x3fff );
2564#endif 2564#endif
2565 /* Setup BUDGETPATCH MAIN RPS1 "program" (p35) */ 2565 /* Setup BUDGETPATCH MAIN RPS1 "program" (p35) */
diff --git a/drivers/media/dvb/ttpci/budget-patch.c b/drivers/media/dvb/ttpci/budget-patch.c
index 60136688a9a4..9c92f9ddd223 100644
--- a/drivers/media/dvb/ttpci/budget-patch.c
+++ b/drivers/media/dvb/ttpci/budget-patch.c
@@ -456,7 +456,7 @@ static int budget_patch_attach (struct saa7146_dev* dev, struct saa7146_pci_exte
456 // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled 456 // use 0x03 to track RPS1 interrupts - increase by 1 every gpio3 is toggled
457 // use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called 457 // use 0x15 to track VPE interrupts - increase by 1 every vpeirq() is called
458 saa7146_write(dev, EC1SSR, (0x03<<2) | 3 ); 458 saa7146_write(dev, EC1SSR, (0x03<<2) | 3 );
459 // set event counter 1 treshold to maximum allowed value (rEC p55) 459 // set event counter 1 threshold to maximum allowed value (rEC p55)
460 saa7146_write(dev, ECT1R, 0x3fff ); 460 saa7146_write(dev, ECT1R, 0x3fff );
461#endif 461#endif
462 // Fix VSYNC level 462 // Fix VSYNC level
diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index a1239083472d..5f79acb56e48 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -28,7 +28,7 @@
28 * http://av-usbradio.sourceforge.net/index.php 28 * http://av-usbradio.sourceforge.net/index.php
29 * http://sourceforge.net/projects/av-usbradio/ 29 * http://sourceforge.net/projects/av-usbradio/
30 * Latest release of theirs project was in 2005. 30 * Latest release of theirs project was in 2005.
31 * Probably, this driver could be improved trough using their 31 * Probably, this driver could be improved through using their
32 * achievements (specifications given). 32 * achievements (specifications given).
33 * Also, Faidon Liambotis <paravoid@debian.org> wrote nice driver for this radio 33 * Also, Faidon Liambotis <paravoid@debian.org> wrote nice driver for this radio
34 * in 2007. He allowed to use his driver to improve current mr800 radio driver. 34 * in 2007. He allowed to use his driver to improve current mr800 radio driver.
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 28f48f41f218..c2174413ab29 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -2414,9 +2414,11 @@ int cx231xx_gpio_i2c_read_ack(struct cx231xx *dev)
2414 cx231xx_info("No ACK after %d msec -GPIO I2C failed!", 2414 cx231xx_info("No ACK after %d msec -GPIO I2C failed!",
2415 nInit * 10); 2415 nInit * 10);
2416 2416
2417 /* readAck 2417 /*
2418 throuth clock stretch ,slave has given a SCL signal, 2418 * readAck
2419 so the SDA data can be directly read. */ 2419 * through clock stretch, slave has given a SCL signal,
2420 * so the SDA data can be directly read.
2421 */
2420 status = cx231xx_get_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val); 2422 status = cx231xx_get_gpio_bit(dev, dev->gpio_dir, (u8 *)&dev->gpio_val);
2421 2423
2422 if ((dev->gpio_val & 1 << dev->board.tuner_sda_gpio) == 0) { 2424 if ((dev->gpio_val & 1 << dev->board.tuner_sda_gpio) == 0) {
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index 45e13ee66dc7..16c6a921f40b 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -940,7 +940,7 @@ int cx23885_dvb_register(struct cx23885_tsport *port)
940 int err, i; 940 int err, i;
941 941
942 /* Here we need to allocate the correct number of frontends, 942 /* Here we need to allocate the correct number of frontends,
943 * as reflected in the cards struct. The reality is that currrently 943 * as reflected in the cards struct. The reality is that currently
944 * no cx23885 boards support this - yet. But, if we don't modify this 944 * no cx23885 boards support this - yet. But, if we don't modify this
945 * code then the second frontend would never be allocated (later) 945 * code then the second frontend would never be allocated (later)
946 * and fail with error before the attach in dvb_register(). 946 * and fail with error before the attach in dvb_register().
diff --git a/drivers/media/video/cx88/cx88-core.c b/drivers/media/video/cx88/cx88-core.c
index cf634606ba9a..b35411160f04 100644
--- a/drivers/media/video/cx88/cx88-core.c
+++ b/drivers/media/video/cx88/cx88-core.c
@@ -624,7 +624,7 @@ int cx88_reset(struct cx88_core *core)
624 /* setup image format */ 624 /* setup image format */
625 cx_andor(MO_COLOR_CTRL, 0x4000, 0x4000); 625 cx_andor(MO_COLOR_CTRL, 0x4000, 0x4000);
626 626
627 /* setup FIFO Threshholds */ 627 /* setup FIFO Thresholds */
628 cx_write(MO_PDMA_STHRSH, 0x0807); 628 cx_write(MO_PDMA_STHRSH, 0x0807);
629 cx_write(MO_PDMA_DTHRSH, 0x0807); 629 cx_write(MO_PDMA_DTHRSH, 0x0807);
630 630
diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c
index 56fbefe036ae..314390016370 100644
--- a/drivers/media/video/davinci/dm355_ccdc.c
+++ b/drivers/media/video/davinci/dm355_ccdc.c
@@ -285,7 +285,7 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam)
285 285
286 if ((ccdcparam->med_filt_thres < 0) || 286 if ((ccdcparam->med_filt_thres < 0) ||
287 (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) { 287 (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) {
288 dev_dbg(dev, "Invalid value of median filter thresold\n"); 288 dev_dbg(dev, "Invalid value of median filter threshold\n");
289 return -EINVAL; 289 return -EINVAL;
290 } 290 }
291 291
diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c
index 6d709ca8cfb0..453236bd7559 100644
--- a/drivers/media/video/davinci/vpss.c
+++ b/drivers/media/video/davinci/vpss.c
@@ -53,7 +53,7 @@ struct vpss_hw_ops {
53 int (*enable_clock)(enum vpss_clock_sel clock_sel, int en); 53 int (*enable_clock)(enum vpss_clock_sel clock_sel, int en);
54 /* select input to ccdc */ 54 /* select input to ccdc */
55 void (*select_ccdc_source)(enum vpss_ccdc_source_sel src_sel); 55 void (*select_ccdc_source)(enum vpss_ccdc_source_sel src_sel);
56 /* clear wbl overlflow bit */ 56 /* clear wbl overflow bit */
57 int (*clear_wbl_overflow)(enum vpss_wbl_sel wbl_sel); 57 int (*clear_wbl_overflow)(enum vpss_wbl_sel wbl_sel);
58}; 58};
59 59
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index cf3af8de6e97..e39efb45fa1c 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -304,7 +304,7 @@ static const __u8 initOv6650[] = {
304}; 304};
305static const __u8 ov6650_sensor_init[][8] = 305static const __u8 ov6650_sensor_init[][8] =
306{ 306{
307 /* Bright, contrast, etc are set througth SCBB interface. 307 /* Bright, contrast, etc are set through SCBB interface.
308 * AVCAP on win2 do not send any data on this controls. */ 308 * AVCAP on win2 do not send any data on this controls. */
309 /* Anyway, some registers appears to alter bright and constrat */ 309 /* Anyway, some registers appears to alter bright and constrat */
310 310
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index fab7ef85a6c1..7dbd5eea6cc0 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -589,7 +589,7 @@ static void spca500_reinit(struct gspca_dev *gspca_dev)
589 int err; 589 int err;
590 __u8 Data; 590 __u8 Data;
591 591
592 /* some unknow command from Aiptek pocket dv and family300 */ 592 /* some unknown command from Aiptek pocket dv and family300 */
593 593
594 reg_w(gspca_dev, 0x00, 0x0d01, 0x01); 594 reg_w(gspca_dev, 0x00, 0x0d01, 0x01);
595 reg_w(gspca_dev, 0x00, 0x0d03, 0x00); 595 reg_w(gspca_dev, 0x00, 0x0d03, 0x00);
diff --git a/drivers/media/video/gspca/spca501.c b/drivers/media/video/gspca/spca501.c
index b74a34218da0..66f9f0056146 100644
--- a/drivers/media/video/gspca/spca501.c
+++ b/drivers/media/video/gspca/spca501.c
@@ -1636,7 +1636,7 @@ static const __u16 spca501c_arowana_init_data[][3] = {
1636 {} 1636 {}
1637}; 1637};
1638 1638
1639/* Unknow camera from Ori Usbid 0x0000:0x0000 */ 1639/* Unknown camera from Ori Usbid 0x0000:0x0000 */
1640/* Based on snoops from Ori Cohen */ 1640/* Based on snoops from Ori Cohen */
1641static const __u16 spca501c_mysterious_open_data[][3] = { 1641static const __u16 spca501c_mysterious_open_data[][3] = {
1642 {0x02, 0x000f, 0x0005}, 1642 {0x02, 0x000f, 0x0005},
@@ -1945,7 +1945,7 @@ static int sd_init(struct gspca_dev *gspca_dev)
1945 goto error; 1945 goto error;
1946 break; 1946 break;
1947 case MystFromOriUnknownCamera: 1947 case MystFromOriUnknownCamera:
1948 /* UnKnow Ori CMOS Camera data */ 1948 /* Unknown Ori CMOS Camera data */
1949 if (write_vector(gspca_dev, spca501c_mysterious_open_data)) 1949 if (write_vector(gspca_dev, spca501c_mysterious_open_data))
1950 goto error; 1950 goto error;
1951 break; 1951 break;
@@ -1978,7 +1978,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
1978 write_vector(gspca_dev, spca501c_arowana_open_data); 1978 write_vector(gspca_dev, spca501c_arowana_open_data);
1979 break; 1979 break;
1980 case MystFromOriUnknownCamera: 1980 case MystFromOriUnknownCamera:
1981 /* UnKnow CMOS Camera data */ 1981 /* Unknown CMOS Camera data */
1982 write_vector(gspca_dev, spca501c_mysterious_init_data); 1982 write_vector(gspca_dev, spca501c_mysterious_init_data);
1983 break; 1983 break;
1984 default: 1984 default:
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c
index aa8f995ce04e..1a9af2ebdbef 100644
--- a/drivers/media/video/gspca/sunplus.c
+++ b/drivers/media/video/gspca/sunplus.c
@@ -631,7 +631,7 @@ static void spca504A_acknowledged_command(struct gspca_dev *gspca_dev,
631 count = 200; 631 count = 200;
632 while (--count > 0) { 632 while (--count > 0) {
633 msleep(10); 633 msleep(10);
634 /* gsmart mini2 write a each wait setting 1 ms is enought */ 634 /* gsmart mini2 write a each wait setting 1 ms is enough */
635/* reg_w_riv(dev, req, idx, val); */ 635/* reg_w_riv(dev, req, idx, val); */
636 status = reg_r_12(gspca_dev, 0x01, 0x0001, 1); 636 status = reg_r_12(gspca_dev, 0x01, 0x0001, 1);
637 if (status == endcode) { 637 if (status == endcode) {
diff --git a/drivers/media/video/gspca/zc3xx.c b/drivers/media/video/gspca/zc3xx.c
index cdf3357b4c9f..49c3c1226e0e 100644
--- a/drivers/media/video/gspca/zc3xx.c
+++ b/drivers/media/video/gspca/zc3xx.c
@@ -7065,7 +7065,7 @@ static int sd_config(struct gspca_dev *gspca_dev,
7065 break; 7065 break;
7066 default: 7066 default:
7067 PDEBUG(D_PROBE, 7067 PDEBUG(D_PROBE,
7068 "Sensor UNKNOW_0 force Tas5130"); 7068 "Sensor UNKNOWN_0 force Tas5130");
7069 sd->sensor = SENSOR_TAS5130CXX; 7069 sd->sensor = SENSOR_TAS5130CXX;
7070 } 7070 }
7071 break; 7071 break;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
index 5b152ff20bd0..5fcad28211d2 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw-internal.h
@@ -332,7 +332,7 @@ struct pvr2_hdw {
332 332
333 /* Bit mask of PVR2_CVAL_INPUT choices which are valid for the hardware */ 333 /* Bit mask of PVR2_CVAL_INPUT choices which are valid for the hardware */
334 unsigned int input_avail_mask; 334 unsigned int input_avail_mask;
335 /* Bit mask of PVR2_CVAL_INPUT choices which are currenly allowed */ 335 /* Bit mask of PVR2_CVAL_INPUT choices which are currently allowed */
336 unsigned int input_allowed_mask; 336 unsigned int input_allowed_mask;
337 337
338 /* Location of eeprom or a negative number if none */ 338 /* Location of eeprom or a negative number if none */
diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 9e3262c0ba37..a4c84368eb10 100644
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -1985,7 +1985,7 @@ static int save_frame(struct s2255_dev *dev, struct s2255_pipeinfo *pipe_info)
1985 wake_up(&dev->fw_data->wait_fw); 1985 wake_up(&dev->fw_data->wait_fw);
1986 break; 1986 break;
1987 default: 1987 default:
1988 printk(KERN_INFO "s2255 unknwn resp\n"); 1988 printk(KERN_INFO "s2255 unknown resp\n");
1989 } 1989 }
1990 default: 1990 default:
1991 pdata++; 1991 pdata++;
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index d439c76b27e1..cb1de7ea197a 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -106,7 +106,7 @@ struct zoran_params {
106 unsigned long jpeg_markers; /* Which markers should go into the JPEG output. 106 unsigned long jpeg_markers; /* Which markers should go into the JPEG output.
107 * Unless you exactly know what you do, leave them untouched. 107 * Unless you exactly know what you do, leave them untouched.
108 * Inluding less markers will make the resulting code 108 * Inluding less markers will make the resulting code
109 * smaller, but there will be fewer aplications 109 * smaller, but there will be fewer applications
110 * which can read it. 110 * which can read it.
111 * The presence of the APP and COM marker is 111 * The presence of the APP and COM marker is
112 * influenced by APP0_len and COM_len ONLY! */ 112 * influenced by APP0_len and COM_len ONLY! */