aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video')
-rw-r--r--drivers/media/video/au0828/au0828-video.c2
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c6
-rw-r--r--drivers/media/video/bt8xx/bttv-gpio.c2
-rw-r--r--drivers/media/video/cafe_ccic.c2
-rw-r--r--drivers/media/video/cx18/cx18-av-core.h2
-rw-r--r--drivers/media/video/cx18/cx18-ioctl.c2
-rw-r--r--drivers/media/video/cx18/cx18-vbi.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx-avcore.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx-vbi.c2
-rw-r--r--drivers/media/video/cx231xx/cx231xx-video.c2
-rw-r--r--drivers/media/video/cx23885/cimax2.c2
-rw-r--r--drivers/media/video/cx23885/cx23885.h2
-rw-r--r--drivers/media/video/cx25840/cx25840-core.c10
-rw-r--r--drivers/media/video/davinci/dm644x_ccdc.c4
-rw-r--r--drivers/media/video/davinci/vpfe_capture.c2
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c4
-rw-r--r--drivers/media/video/gspca/gl860/gl860-mi1320.c2
-rw-r--r--drivers/media/video/gspca/gspca.c4
-rw-r--r--drivers/media/video/gspca/mars.c2
-rw-r--r--drivers/media/video/gspca/mr97310a.c2
-rw-r--r--drivers/media/video/gspca/ov519.c4
-rw-r--r--drivers/media/video/gspca/sonixb.c2
-rw-r--r--drivers/media/video/gspca/spca500.c4
-rw-r--r--drivers/media/video/gspca/spca508.c2
-rw-r--r--drivers/media/video/gspca/sq905.c2
-rw-r--r--drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c2
-rw-r--r--drivers/media/video/hexium_gemini.c2
-rw-r--r--drivers/media/video/ivtv/ivtv-firmware.c4
-rw-r--r--drivers/media/video/ivtv/ivtvfb.c2
-rw-r--r--drivers/media/video/msp3400-driver.c4
-rw-r--r--drivers/media/video/msp3400-kthreads.c2
-rw-r--r--drivers/media/video/omap/omap_vout.c4
-rw-r--r--drivers/media/video/omap/omap_voutlib.c6
-rw-r--r--drivers/media/video/omap1_camera.c4
-rw-r--r--drivers/media/video/omap3isp/isp.c8
-rw-r--r--drivers/media/video/omap3isp/ispccdc.h4
-rw-r--r--drivers/media/video/omap3isp/ispccp2.c2
-rw-r--r--drivers/media/video/omap3isp/ispcsi2.c2
-rw-r--r--drivers/media/video/omap3isp/isppreview.c20
-rw-r--r--drivers/media/video/omap3isp/isppreview.h2
-rw-r--r--drivers/media/video/omap3isp/ispqueue.h4
-rw-r--r--drivers/media/video/omap3isp/ispresizer.c4
-rw-r--r--drivers/media/video/omap3isp/ispvideo.c6
-rw-r--r--drivers/media/video/ov6650.c2
-rw-r--r--drivers/media/video/ov9640.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-eeprom.c2
-rw-r--r--drivers/media/video/pvrusb2/pvrusb2-hdw.h2
-rw-r--r--drivers/media/video/pxa_camera.c2
-rw-r--r--drivers/media/video/s5p-fimc/fimc-reg.c2
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c4
-rw-r--r--drivers/media/video/saa7164/saa7164-cmd.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-fw.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-types.h2
-rw-r--r--drivers/media/video/sn9c102/sn9c102_core.c2
-rw-r--r--drivers/media/video/sn9c102/sn9c102_sensor.h2
-rw-r--r--drivers/media/video/tcm825x.c4
-rw-r--r--drivers/media/video/tvaudio.c10
-rw-r--r--drivers/media/video/uvc/uvc_video.c8
-rw-r--r--drivers/media/video/v4l2-ioctl.c2
-rw-r--r--drivers/media/video/vpx3220.c2
-rw-r--r--drivers/media/video/zoran/videocodec.h2
-rw-r--r--drivers/media/video/zoran/zoran.h2
-rw-r--r--drivers/media/video/zoran/zoran_driver.c2
63 files changed, 106 insertions, 106 deletions
diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c
index 6ad83a15d07..c03eb29a9ee 100644
--- a/drivers/media/video/au0828/au0828-video.c
+++ b/drivers/media/video/au0828/au0828-video.c
@@ -502,7 +502,7 @@ static inline void vbi_get_next_buf(struct au0828_dmaqueue *dma_q,
502 502
503 /* Get the next buffer */ 503 /* Get the next buffer */
504 *buf = list_entry(dma_q->active.next, struct au0828_buffer, vb.queue); 504 *buf = list_entry(dma_q->active.next, struct au0828_buffer, vb.queue);
505 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 505 /* Cleans up buffer - Useful for testing for frame/URB loss */
506 outp = videobuf_to_vmalloc(&(*buf)->vb); 506 outp = videobuf_to_vmalloc(&(*buf)->vb);
507 memset(outp, 0x00, (*buf)->vb.size); 507 memset(outp, 0x00, (*buf)->vb.size);
508 508
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 242f0d51223..3c9e6c7e7b5 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -2244,8 +2244,8 @@ struct tvcard bttv_tvcards[] = {
2244 }, 2244 },
2245 [BTTV_BOARD_PICOLO_TETRA_CHIP] = { 2245 [BTTV_BOARD_PICOLO_TETRA_CHIP] = {
2246 /*Eric DEBIEF <debief@telemsa.com>*/ 2246 /*Eric DEBIEF <debief@telemsa.com>*/
2247 /*EURESYS Picolo Tetra : 4 Conexant Fusion 878A, no audio, video input set with analog multiplexers GPIO controled*/ 2247 /*EURESYS Picolo Tetra : 4 Conexant Fusion 878A, no audio, video input set with analog multiplexers GPIO controlled*/
2248 /* adds picolo_tetra_muxsel(), picolo_tetra_init(), the folowing declaration strucure, and #define BTTV_BOARD_PICOLO_TETRA_CHIP*/ 2248 /* adds picolo_tetra_muxsel(), picolo_tetra_init(), the following declaration strucure, and #define BTTV_BOARD_PICOLO_TETRA_CHIP*/
2249 /*0x79 in bttv.h*/ 2249 /*0x79 in bttv.h*/
2250 .name = "Euresys Picolo Tetra", 2250 .name = "Euresys Picolo Tetra",
2251 .video_inputs = 4, 2251 .video_inputs = 4,
@@ -4567,7 +4567,7 @@ static void picolo_tetra_muxsel (struct bttv* btv, unsigned int input)
4567 * at one input while the monitor is looking at another. 4567 * at one input while the monitor is looking at another.
4568 * 4568 *
4569 * Since I've couldn't be bothered figuring out how to add an 4569 * Since I've couldn't be bothered figuring out how to add an
4570 * independant muxsel for the monitor bus, I've just set it to 4570 * independent muxsel for the monitor bus, I've just set it to
4571 * whatever the card is looking at. 4571 * whatever the card is looking at.
4572 * 4572 *
4573 * OUT0 of the TDA8540's is connected to MUX0 (0x03) 4573 * OUT0 of the TDA8540's is connected to MUX0 (0x03)
diff --git a/drivers/media/video/bt8xx/bttv-gpio.c b/drivers/media/video/bt8xx/bttv-gpio.c
index fd604d32bbb..13ce72c04b3 100644
--- a/drivers/media/video/bt8xx/bttv-gpio.c
+++ b/drivers/media/video/bt8xx/bttv-gpio.c
@@ -3,7 +3,7 @@
3 bttv-gpio.c -- gpio sub drivers 3 bttv-gpio.c -- gpio sub drivers
4 4
5 sysfs-based sub driver interface for bttv 5 sysfs-based sub driver interface for bttv
6 mainly intented for gpio access 6 mainly intended for gpio access
7 7
8 8
9 Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de) 9 Copyright (C) 1996,97,98 Ralph Metzler (rjkm@thp.uni-koeln.de)
diff --git a/drivers/media/video/cafe_ccic.c b/drivers/media/video/cafe_ccic.c
index 55ffd60ffa7..66470339849 100644
--- a/drivers/media/video/cafe_ccic.c
+++ b/drivers/media/video/cafe_ccic.c
@@ -383,7 +383,7 @@ static int cafe_smbus_write_data(struct cafe_camera *cam,
383 * causes the device to die. 383 * causes the device to die.
384 * Use a busy-wait because we often send a large quantity of small 384 * Use a busy-wait because we often send a large quantity of small
385 * commands at-once; using msleep() would cause a lot of context 385 * commands at-once; using msleep() would cause a lot of context
386 * switches which take longer than 2ms, resulting in a noticable 386 * switches which take longer than 2ms, resulting in a noticeable
387 * boot-time and capture-start delays. 387 * boot-time and capture-start delays.
388 */ 388 */
389 mdelay(2); 389 mdelay(2);
diff --git a/drivers/media/video/cx18/cx18-av-core.h b/drivers/media/video/cx18/cx18-av-core.h
index 188c9c3d2db..e9c69d9c9e4 100644
--- a/drivers/media/video/cx18/cx18-av-core.h
+++ b/drivers/media/video/cx18/cx18-av-core.h
@@ -109,7 +109,7 @@ struct cx18_av_state {
109 int is_initialized; 109 int is_initialized;
110 110
111 /* 111 /*
112 * The VBI slicer starts operating and counting lines, begining at 112 * The VBI slicer starts operating and counting lines, beginning at
113 * slicer line count of 1, at D lines after the deassertion of VRESET. 113 * slicer line count of 1, at D lines after the deassertion of VRESET.
114 * This staring field line, S, is 6 (& 319) or 10 (& 273) for 625 or 525 114 * This staring field line, S, is 6 (& 319) or 10 (& 273) for 625 or 525
115 * line systems respectively. Sliced ancillary data captured on VBI 115 * line systems respectively. Sliced ancillary data captured on VBI
diff --git a/drivers/media/video/cx18/cx18-ioctl.c b/drivers/media/video/cx18/cx18-ioctl.c
index 86c30b9963e..4f041c033c5 100644
--- a/drivers/media/video/cx18/cx18-ioctl.c
+++ b/drivers/media/video/cx18/cx18-ioctl.c
@@ -312,7 +312,7 @@ static int cx18_s_fmt_vbi_cap(struct file *file, void *fh,
312 312
313 /* 313 /*
314 * Set the digitizer registers for raw active VBI. 314 * Set the digitizer registers for raw active VBI.
315 * Note cx18_av_vbi_wipes out alot of the passed in fmt under valid 315 * Note cx18_av_vbi_wipes out a lot of the passed in fmt under valid
316 * calling conditions 316 * calling conditions
317 */ 317 */
318 ret = v4l2_subdev_call(cx->sd_av, vbi, s_raw_fmt, &fmt->fmt.vbi); 318 ret = v4l2_subdev_call(cx->sd_av, vbi, s_raw_fmt, &fmt->fmt.vbi);
diff --git a/drivers/media/video/cx18/cx18-vbi.c b/drivers/media/video/cx18/cx18-vbi.c
index 582227522cf..6d3121ff45a 100644
--- a/drivers/media/video/cx18/cx18-vbi.c
+++ b/drivers/media/video/cx18/cx18-vbi.c
@@ -29,7 +29,7 @@
29/* 29/*
30 * Raster Reference/Protection (RP) bytes, used in Start/End Active 30 * Raster Reference/Protection (RP) bytes, used in Start/End Active
31 * Video codes emitted from the digitzer in VIP 1.x mode, that flag the start 31 * Video codes emitted from the digitzer in VIP 1.x mode, that flag the start
32 * of VBI sample or VBI ancilliary data regions in the digitial ratser line. 32 * of VBI sample or VBI ancillary data regions in the digitial ratser line.
33 * 33 *
34 * Task FieldEven VerticalBlank HorizontalBlank 0 0 0 0 34 * Task FieldEven VerticalBlank HorizontalBlank 0 0 0 0
35 */ 35 */
diff --git a/drivers/media/video/cx231xx/cx231xx-avcore.c b/drivers/media/video/cx231xx/cx231xx-avcore.c
index 62843d39817..280df43ca44 100644
--- a/drivers/media/video/cx231xx/cx231xx-avcore.c
+++ b/drivers/media/video/cx231xx/cx231xx-avcore.c
@@ -2577,7 +2577,7 @@ int cx231xx_initialize_stream_xfer(struct cx231xx *dev, u32 media_type)
2577 break; 2577 break;
2578 2578
2579 case 6: /* ts1 parallel mode */ 2579 case 6: /* ts1 parallel mode */
2580 cx231xx_info("%s: set ts1 parrallel mode registers\n", 2580 cx231xx_info("%s: set ts1 parallel mode registers\n",
2581 __func__); 2581 __func__);
2582 status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100); 2582 status = cx231xx_mode_register(dev, TS_MODE_REG, 0x100);
2583 status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400); 2583 status = cx231xx_mode_register(dev, TS1_CFG_REG, 0x400);
diff --git a/drivers/media/video/cx231xx/cx231xx-vbi.c b/drivers/media/video/cx231xx/cx231xx-vbi.c
index 1d914488dbb..1c7a4daafec 100644
--- a/drivers/media/video/cx231xx/cx231xx-vbi.c
+++ b/drivers/media/video/cx231xx/cx231xx-vbi.c
@@ -631,7 +631,7 @@ static inline void get_next_vbi_buf(struct cx231xx_dmaqueue *dma_q,
631 /* Get the next buffer */ 631 /* Get the next buffer */
632 *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue); 632 *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue);
633 633
634 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 634 /* Cleans up buffer - Useful for testing for frame/URB loss */
635 outp = videobuf_to_vmalloc(&(*buf)->vb); 635 outp = videobuf_to_vmalloc(&(*buf)->vb);
636 memset(outp, 0, (*buf)->vb.size); 636 memset(outp, 0, (*buf)->vb.size);
637 637
diff --git a/drivers/media/video/cx231xx/cx231xx-video.c b/drivers/media/video/cx231xx/cx231xx-video.c
index ffd5af914c4..a69c24d8db0 100644
--- a/drivers/media/video/cx231xx/cx231xx-video.c
+++ b/drivers/media/video/cx231xx/cx231xx-video.c
@@ -309,7 +309,7 @@ static inline void get_next_buf(struct cx231xx_dmaqueue *dma_q,
309 /* Get the next buffer */ 309 /* Get the next buffer */
310 *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue); 310 *buf = list_entry(dma_q->active.next, struct cx231xx_buffer, vb.queue);
311 311
312 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 312 /* Cleans up buffer - Useful for testing for frame/URB loss */
313 outp = videobuf_to_vmalloc(&(*buf)->vb); 313 outp = videobuf_to_vmalloc(&(*buf)->vb);
314 memset(outp, 0, (*buf)->vb.size); 314 memset(outp, 0, (*buf)->vb.size);
315 315
diff --git a/drivers/media/video/cx23885/cimax2.c b/drivers/media/video/cx23885/cimax2.c
index 209b971bd26..c9f15d6dec4 100644
--- a/drivers/media/video/cx23885/cimax2.c
+++ b/drivers/media/video/cx23885/cimax2.c
@@ -449,7 +449,7 @@ int netup_ci_init(struct cx23885_tsport *port)
449 0x04, /* ack active low */ 449 0x04, /* ack active low */
450 0x00, /* LOCK = 0 */ 450 0x00, /* LOCK = 0 */
451 0x33, /* serial mode, rising in, rising out, MSB first*/ 451 0x33, /* serial mode, rising in, rising out, MSB first*/
452 0x31, /* syncronization */ 452 0x31, /* synchronization */
453 }; 453 };
454 int ret; 454 int ret;
455 455
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 8db2797bc7c..c186473fc57 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -214,7 +214,7 @@ struct cx23885_board {
214 214
215 /* Vendors can and do run the PCIe bridge at different 215 /* Vendors can and do run the PCIe bridge at different
216 * clock rates, driven physically by crystals on the PCBs. 216 * clock rates, driven physically by crystals on the PCBs.
217 * The core has to accomodate this. This allows the user 217 * The core has to accommodate this. This allows the user
218 * to add new boards with new frequencys. The value is 218 * to add new boards with new frequencys. The value is
219 * expressed in Hz. 219 * expressed in Hz.
220 * 220 *
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index 35796e03524..b7ee2ae7058 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -2,7 +2,7 @@
2 * 2 *
3 * Copyright (C) 2004 Ulf Eklund 3 * Copyright (C) 2004 Ulf Eklund
4 * 4 *
5 * Based on the saa7115 driver and on the first verison of Chris Kennedy's 5 * Based on the saa7115 driver and on the first version of Chris Kennedy's
6 * cx25840 driver. 6 * cx25840 driver.
7 * 7 *
8 * Changes by Tyler Trafford <tatrafford@comcast.net> 8 * Changes by Tyler Trafford <tatrafford@comcast.net>
@@ -445,7 +445,7 @@ static void cx25840_initialize(struct i2c_client *client)
445 cx25840_write(client, 0x918, 0xa0); 445 cx25840_write(client, 0x918, 0xa0);
446 cx25840_write(client, 0x919, 0x01); 446 cx25840_write(client, 0x919, 0x01);
447 447
448 /* stereo prefered */ 448 /* stereo preferred */
449 cx25840_write(client, 0x809, 0x04); 449 cx25840_write(client, 0x809, 0x04);
450 /* AC97 shift */ 450 /* AC97 shift */
451 cx25840_write(client, 0x8cf, 0x0f); 451 cx25840_write(client, 0x8cf, 0x0f);
@@ -546,7 +546,7 @@ static void cx23885_initialize(struct i2c_client *client)
546 * Aux PLL 546 * Aux PLL
547 * Initial setup for audio sample clock: 547 * Initial setup for audio sample clock:
548 * 48 ksps, 16 bits/sample, x160 multiplier = 122.88 MHz 548 * 48 ksps, 16 bits/sample, x160 multiplier = 122.88 MHz
549 * Intial I2S output/master clock(?): 549 * Initial I2S output/master clock(?):
550 * 48 ksps, 16 bits/sample, x16 multiplier = 12.288 MHz 550 * 48 ksps, 16 bits/sample, x16 multiplier = 12.288 MHz
551 */ 551 */
552 switch (state->id) { 552 switch (state->id) {
@@ -903,7 +903,7 @@ static void input_change(struct i2c_client *client)
903 } else if (std & V4L2_STD_PAL) { 903 } else if (std & V4L2_STD_PAL) {
904 /* Autodetect audio standard and audio system */ 904 /* Autodetect audio standard and audio system */
905 cx25840_write(client, 0x808, 0xff); 905 cx25840_write(client, 0x808, 0xff);
906 /* Since system PAL-L is pretty much non-existant and 906 /* Since system PAL-L is pretty much non-existent and
907 not used by any public broadcast network, force 907 not used by any public broadcast network, force
908 6.5 MHz carrier to be interpreted as System DK, 908 6.5 MHz carrier to be interpreted as System DK,
909 this avoids DK audio detection instability */ 909 this avoids DK audio detection instability */
@@ -1851,7 +1851,7 @@ static u32 get_cx2388x_ident(struct i2c_client *client)
1851 ret = V4L2_IDENT_CX23885_AV; 1851 ret = V4L2_IDENT_CX23885_AV;
1852 } else { 1852 } else {
1853 /* CX23887 has a broken DIF, but the registers 1853 /* CX23887 has a broken DIF, but the registers
1854 * appear valid (but unsed), good enough to detect. */ 1854 * appear valid (but unused), good enough to detect. */
1855 ret = V4L2_IDENT_CX23887_AV; 1855 ret = V4L2_IDENT_CX23887_AV;
1856 } 1856 }
1857 } else if (cx25840_read4(client, 0x300) & 0x0fffffff) { 1857 } else if (cx25840_read4(client, 0x300) & 0x0fffffff) {
diff --git a/drivers/media/video/davinci/dm644x_ccdc.c b/drivers/media/video/davinci/dm644x_ccdc.c
index 490aafb34e2..c8b32c1c738 100644
--- a/drivers/media/video/davinci/dm644x_ccdc.c
+++ b/drivers/media/video/davinci/dm644x_ccdc.c
@@ -258,7 +258,7 @@ static int ccdc_update_raw_params(struct ccdc_config_params_raw *raw_params)
258 /* 258 /*
259 * Allocate memory for FPC table if current 259 * Allocate memory for FPC table if current
260 * FPC table buffer is not big enough to 260 * FPC table buffer is not big enough to
261 * accomodate FPC Number requested 261 * accommodate FPC Number requested
262 */ 262 */
263 if (raw_params->fault_pxl.fp_num != config_params->fault_pxl.fp_num) { 263 if (raw_params->fault_pxl.fp_num != config_params->fault_pxl.fp_num) {
264 if (fpc_physaddr != NULL) { 264 if (fpc_physaddr != NULL) {
@@ -436,7 +436,7 @@ void ccdc_config_ycbcr(void)
436 436
437 /* 437 /*
438 * configure the horizontal line offset. This should be a 438 * configure the horizontal line offset. This should be a
439 * on 32 byte bondary. So clear LSB 5 bits 439 * on 32 byte boundary. So clear LSB 5 bits
440 */ 440 */
441 regw(((params->win.width * 2 + 31) & ~0x1f), CCDC_HSIZE_OFF); 441 regw(((params->win.width * 2 + 31) & ~0x1f), CCDC_HSIZE_OFF);
442 442
diff --git a/drivers/media/video/davinci/vpfe_capture.c b/drivers/media/video/davinci/vpfe_capture.c
index 71e961e53a5..5b38fc93ff2 100644
--- a/drivers/media/video/davinci/vpfe_capture.c
+++ b/drivers/media/video/davinci/vpfe_capture.c
@@ -1691,7 +1691,7 @@ static int vpfe_s_crop(struct file *file, void *priv,
1691 goto unlock_out; 1691 goto unlock_out;
1692 } 1692 }
1693 1693
1694 /* adjust the width to 16 pixel boundry */ 1694 /* adjust the width to 16 pixel boundary */
1695 crop->c.width = ((crop->c.width + 15) & ~0xf); 1695 crop->c.width = ((crop->c.width + 15) & ~0xf);
1696 1696
1697 /* make sure parameters are valid */ 1697 /* make sure parameters are valid */
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index a83131bd00b..7b6461d2d1f 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -377,7 +377,7 @@ static inline void get_next_buf(struct em28xx_dmaqueue *dma_q,
377 /* Get the next buffer */ 377 /* Get the next buffer */
378 *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue); 378 *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
379 379
380 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 380 /* Cleans up buffer - Useful for testing for frame/URB loss */
381 outp = videobuf_to_vmalloc(&(*buf)->vb); 381 outp = videobuf_to_vmalloc(&(*buf)->vb);
382 memset(outp, 0, (*buf)->vb.size); 382 memset(outp, 0, (*buf)->vb.size);
383 383
@@ -404,7 +404,7 @@ static inline void vbi_get_next_buf(struct em28xx_dmaqueue *dma_q,
404 404
405 /* Get the next buffer */ 405 /* Get the next buffer */
406 *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue); 406 *buf = list_entry(dma_q->active.next, struct em28xx_buffer, vb.queue);
407 /* Cleans up buffer - Usefull for testing for frame/URB loss */ 407 /* Cleans up buffer - Useful for testing for frame/URB loss */
408 outp = videobuf_to_vmalloc(&(*buf)->vb); 408 outp = videobuf_to_vmalloc(&(*buf)->vb);
409 memset(outp, 0x00, (*buf)->vb.size); 409 memset(outp, 0x00, (*buf)->vb.size);
410 410
diff --git a/drivers/media/video/gspca/gl860/gl860-mi1320.c b/drivers/media/video/gspca/gl860/gl860-mi1320.c
index c276a7debde..b57160e0486 100644
--- a/drivers/media/video/gspca/gl860/gl860-mi1320.c
+++ b/drivers/media/video/gspca/gl860/gl860-mi1320.c
@@ -201,7 +201,7 @@ void mi1320_init_settings(struct gspca_dev *gspca_dev)
201 sd->vmax.backlight = 2; 201 sd->vmax.backlight = 2;
202 sd->vmax.brightness = 8; 202 sd->vmax.brightness = 8;
203 sd->vmax.sharpness = 7; 203 sd->vmax.sharpness = 7;
204 sd->vmax.contrast = 0; /* 10 but not working with tihs driver */ 204 sd->vmax.contrast = 0; /* 10 but not working with this driver */
205 sd->vmax.gamma = 40; 205 sd->vmax.gamma = 40;
206 sd->vmax.hue = 5 + 1; 206 sd->vmax.hue = 5 + 1;
207 sd->vmax.saturation = 8; 207 sd->vmax.saturation = 8;
diff --git a/drivers/media/video/gspca/gspca.c b/drivers/media/video/gspca/gspca.c
index 9c6a643caf0..e526aa3deda 100644
--- a/drivers/media/video/gspca/gspca.c
+++ b/drivers/media/video/gspca/gspca.c
@@ -857,7 +857,7 @@ static int gspca_init_transfer(struct gspca_dev *gspca_dev)
857 } 857 }
858 858
859 /* the bandwidth is not wide enough 859 /* the bandwidth is not wide enough
860 * negociate or try a lower alternate setting */ 860 * negotiate or try a lower alternate setting */
861 PDEBUG(D_ERR|D_STREAM, 861 PDEBUG(D_ERR|D_STREAM,
862 "bandwidth not wide enough - trying again"); 862 "bandwidth not wide enough - trying again");
863 msleep(20); /* wait for kill complete */ 863 msleep(20); /* wait for kill complete */
@@ -2346,7 +2346,7 @@ void gspca_disconnect(struct usb_interface *intf)
2346 usb_set_intfdata(intf, NULL); 2346 usb_set_intfdata(intf, NULL);
2347 2347
2348 /* release the device */ 2348 /* release the device */
2349 /* (this will call gspca_release() immediatly or on last close) */ 2349 /* (this will call gspca_release() immediately or on last close) */
2350 video_unregister_device(&gspca_dev->vdev); 2350 video_unregister_device(&gspca_dev->vdev);
2351 2351
2352/* PDEBUG(D_PROBE, "disconnect complete"); */ 2352/* PDEBUG(D_PROBE, "disconnect complete"); */
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c
index cb4d0bf0d78..0196209a948 100644
--- a/drivers/media/video/gspca/mars.c
+++ b/drivers/media/video/gspca/mars.c
@@ -361,7 +361,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
361 mi_w(gspca_dev, i + 1, mi_data[i]); 361 mi_w(gspca_dev, i + 1, mi_data[i]);
362 362
363 data[0] = 0x00; 363 data[0] = 0x00;
364 data[1] = 0x4d; /* ISOC transfering enable... */ 364 data[1] = 0x4d; /* ISOC transferring enable... */
365 reg_w(gspca_dev, 2); 365 reg_w(gspca_dev, 2);
366 366
367 gspca_dev->ctrl_inac = 0; /* activate the illuminator controls */ 367 gspca_dev->ctrl_inac = 0; /* activate the illuminator controls */
diff --git a/drivers/media/video/gspca/mr97310a.c b/drivers/media/video/gspca/mr97310a.c
index 3884c9d300c..97e50796743 100644
--- a/drivers/media/video/gspca/mr97310a.c
+++ b/drivers/media/video/gspca/mr97310a.c
@@ -469,7 +469,7 @@ static void lcd_stop(struct gspca_dev *gspca_dev)
469static int isoc_enable(struct gspca_dev *gspca_dev) 469static int isoc_enable(struct gspca_dev *gspca_dev)
470{ 470{
471 gspca_dev->usb_buf[0] = 0x00; 471 gspca_dev->usb_buf[0] = 0x00;
472 gspca_dev->usb_buf[1] = 0x4d; /* ISOC transfering enable... */ 472 gspca_dev->usb_buf[1] = 0x4d; /* ISOC transferring enable... */
473 return mr_write(gspca_dev, 2); 473 return mr_write(gspca_dev, 2);
474} 474}
475 475
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519.c
index fd1b6082c96..36a46fc7873 100644
--- a/drivers/media/video/gspca/ov519.c
+++ b/drivers/media/video/gspca/ov519.c
@@ -381,7 +381,7 @@ static const struct v4l2_pix_format ov519_sif_mode[] = {
381 larger then necessary, however they need to be this big as the ov511 / 381 larger then necessary, however they need to be this big as the ov511 /
382 ov518 always fills the entire isoc frame, using 0 padding bytes when 382 ov518 always fills the entire isoc frame, using 0 padding bytes when
383 it doesn't have any data. So with low framerates the amount of data 383 it doesn't have any data. So with low framerates the amount of data
384 transfered can become quite large (libv4l will remove all the 0 padding 384 transferred can become quite large (libv4l will remove all the 0 padding
385 in userspace). */ 385 in userspace). */
386static const struct v4l2_pix_format ov518_vga_mode[] = { 386static const struct v4l2_pix_format ov518_vga_mode[] = {
387 {320, 240, V4L2_PIX_FMT_OV518, V4L2_FIELD_NONE, 387 {320, 240, V4L2_PIX_FMT_OV518, V4L2_FIELD_NONE,
@@ -4368,7 +4368,7 @@ static void ov511_pkt_scan(struct gspca_dev *gspca_dev,
4368 gspca_dev->last_packet_type = DISCARD_PACKET; 4368 gspca_dev->last_packet_type = DISCARD_PACKET;
4369 return; 4369 return;
4370 } 4370 }
4371 /* Add 11 byte footer to frame, might be usefull */ 4371 /* Add 11 byte footer to frame, might be useful */
4372 gspca_frame_add(gspca_dev, LAST_PACKET, in, 11); 4372 gspca_frame_add(gspca_dev, LAST_PACKET, in, 11);
4373 return; 4373 return;
4374 } else { 4374 } else {
diff --git a/drivers/media/video/gspca/sonixb.c b/drivers/media/video/gspca/sonixb.c
index 5a08738fba3..146b459b08d 100644
--- a/drivers/media/video/gspca/sonixb.c
+++ b/drivers/media/video/gspca/sonixb.c
@@ -827,7 +827,7 @@ static void setexposure(struct gspca_dev *gspca_dev)
827 possible to use less exposure then what the fps maximum 827 possible to use less exposure then what the fps maximum
828 allows by setting register 10. register 10 configures the 828 allows by setting register 10. register 10 configures the
829 actual exposure as quotient of the full exposure, with 0 829 actual exposure as quotient of the full exposure, with 0
830 being no exposure at all (not very usefull) and reg10_max 830 being no exposure at all (not very useful) and reg10_max
831 being max exposure possible at that framerate. 831 being max exposure possible at that framerate.
832 832
833 The code maps our 0 - 510 ms exposure ctrl to these 2 833 The code maps our 0 - 510 ms exposure ctrl to these 2
diff --git a/drivers/media/video/gspca/spca500.c b/drivers/media/video/gspca/spca500.c
index 45552c3ff8d..3e76951e3c1 100644
--- a/drivers/media/video/gspca/spca500.c
+++ b/drivers/media/video/gspca/spca500.c
@@ -607,7 +607,7 @@ static void spca500_reinit(struct gspca_dev *gspca_dev)
607 reg_w(gspca_dev, 0x00, 0x8880, 2); 607 reg_w(gspca_dev, 0x00, 0x8880, 2);
608 /* family cam Quicksmart stuff */ 608 /* family cam Quicksmart stuff */
609 reg_w(gspca_dev, 0x00, 0x800a, 0x00); 609 reg_w(gspca_dev, 0x00, 0x800a, 0x00);
610 /* Set agc transfer: synced inbetween frames */ 610 /* Set agc transfer: synced between frames */
611 reg_w(gspca_dev, 0x00, 0x820f, 0x01); 611 reg_w(gspca_dev, 0x00, 0x820f, 0x01);
612 /* Init SDRAM - needed for SDRAM access */ 612 /* Init SDRAM - needed for SDRAM access */
613 reg_w(gspca_dev, 0x00, 0x870a, 0x04); 613 reg_w(gspca_dev, 0x00, 0x870a, 0x04);
@@ -831,7 +831,7 @@ static int sd_start(struct gspca_dev *gspca_dev)
831 831
832 /* familycam Quicksmart pocketDV stuff */ 832 /* familycam Quicksmart pocketDV stuff */
833 reg_w(gspca_dev, 0x00, 0x800a, 0x00); 833 reg_w(gspca_dev, 0x00, 0x800a, 0x00);
834 /* Set agc transfer: synced inbetween frames */ 834 /* Set agc transfer: synced between frames */
835 reg_w(gspca_dev, 0x00, 0x820f, 0x01); 835 reg_w(gspca_dev, 0x00, 0x820f, 0x01);
836 /* Init SDRAM - needed for SDRAM access */ 836 /* Init SDRAM - needed for SDRAM access */
837 reg_w(gspca_dev, 0x00, 0x870a, 0x04); 837 reg_w(gspca_dev, 0x00, 0x870a, 0x04);
diff --git a/drivers/media/video/gspca/spca508.c b/drivers/media/video/gspca/spca508.c
index 34831937152..41dce49fb43 100644
--- a/drivers/media/video/gspca/spca508.c
+++ b/drivers/media/video/gspca/spca508.c
@@ -592,7 +592,7 @@ static const u16 spca508_sightcam_init_data[][2] = {
592/* This line seems to setup the frame/canvas */ 592/* This line seems to setup the frame/canvas */
593 {0x000f, 0x8402}, 593 {0x000f, 0x8402},
594 594
595/* Theese 6 lines are needed to startup the webcam */ 595/* These 6 lines are needed to startup the webcam */
596 {0x0090, 0x8110}, 596 {0x0090, 0x8110},
597 {0x0001, 0x8114}, 597 {0x0001, 0x8114},
598 {0x0001, 0x8114}, 598 {0x0001, 0x8114},
diff --git a/drivers/media/video/gspca/sq905.c b/drivers/media/video/gspca/sq905.c
index 2e9c0617519..5ba96aff225 100644
--- a/drivers/media/video/gspca/sq905.c
+++ b/drivers/media/video/gspca/sq905.c
@@ -22,7 +22,7 @@
22 * History and Acknowledgments 22 * History and Acknowledgments
23 * 23 *
24 * The original Linux driver for SQ905 based cameras was written by 24 * The original Linux driver for SQ905 based cameras was written by
25 * Marcell Lengyel and furter developed by many other contributers 25 * Marcell Lengyel and furter developed by many other contributors
26 * and is available from http://sourceforge.net/projects/sqcam/ 26 * and is available from http://sourceforge.net/projects/sqcam/
27 * 27 *
28 * This driver takes advantage of the reverse engineering work done for 28 * This driver takes advantage of the reverse engineering work done for
diff --git a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
index 17531b41a07..b8156855f2b 100644
--- a/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
+++ b/drivers/media/video/gspca/stv06xx/stv06xx_hdcs.c
@@ -569,7 +569,7 @@ static int hdcs_init(struct sd *sd)
569 if (err < 0) 569 if (err < 0)
570 return err; 570 return err;
571 571
572 /* Enable continous frame capture, bit 2: stop when frame complete */ 572 /* Enable continuous frame capture, bit 2: stop when frame complete */
573 err = stv06xx_write_sensor(sd, HDCS_REG_CONFIG(sd), BIT(3)); 573 err = stv06xx_write_sensor(sd, HDCS_REG_CONFIG(sd), BIT(3));
574 if (err < 0) 574 if (err < 0)
575 return err; 575 return err;
diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index cdf8b191f71..cbc505a2fc2 100644
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -261,7 +261,7 @@ static int vidioc_s_input(struct file *file, void *fh, unsigned int input)
261 261
262/* the saa7146 provides some controls (brightness, contrast, saturation) 262/* the saa7146 provides some controls (brightness, contrast, saturation)
263 which gets registered *after* this function. because of this we have 263 which gets registered *after* this function. because of this we have
264 to return with a value != 0 even if the function succeded.. */ 264 to return with a value != 0 even if the function succeeded.. */
265static int vidioc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *qc) 265static int vidioc_queryctrl(struct file *file, void *fh, struct v4l2_queryctrl *qc)
266{ 266{
267 struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev; 267 struct saa7146_dev *dev = ((struct saa7146_fh *)fh)->dev;
diff --git a/drivers/media/video/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c
index 4df01947a7d..14a1cea1d70 100644
--- a/drivers/media/video/ivtv/ivtv-firmware.c
+++ b/drivers/media/video/ivtv/ivtv-firmware.c
@@ -179,7 +179,7 @@ static volatile struct ivtv_mailbox __iomem *ivtv_search_mailbox(const volatile
179{ 179{
180 int i; 180 int i;
181 181
182 /* mailbox is preceeded by a 16 byte 'magic cookie' starting at a 256-byte 182 /* mailbox is preceded by a 16 byte 'magic cookie' starting at a 256-byte
183 address boundary */ 183 address boundary */
184 for (i = 0; i < size; i += 0x100) { 184 for (i = 0; i < size; i += 0x100) {
185 if (readl(mem + i) == 0x12345678 && 185 if (readl(mem + i) == 0x12345678 &&
@@ -377,7 +377,7 @@ int ivtv_firmware_check(struct ivtv *itv, char *where)
377 "Reloading\n", where); 377 "Reloading\n", where);
378 res = ivtv_firmware_restart(itv); 378 res = ivtv_firmware_restart(itv);
379 /* 379 /*
380 * Even if restarted ok, still signal a problem had occured. 380 * Even if restarted ok, still signal a problem had occurred.
381 * The caller can come through this function again to check 381 * The caller can come through this function again to check
382 * if things are really ok after the restart. 382 * if things are really ok after the restart.
383 */ 383 */
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c
index f0316d02f09..17247451c69 100644
--- a/drivers/media/video/ivtv/ivtvfb.c
+++ b/drivers/media/video/ivtv/ivtvfb.c
@@ -1080,7 +1080,7 @@ static int ivtvfb_init_vidmode(struct ivtv *itv)
1080 kmalloc(sizeof(u32) * 16, GFP_KERNEL|__GFP_NOWARN); 1080 kmalloc(sizeof(u32) * 16, GFP_KERNEL|__GFP_NOWARN);
1081 1081
1082 if (!oi->ivtvfb_info.pseudo_palette) { 1082 if (!oi->ivtvfb_info.pseudo_palette) {
1083 IVTVFB_ERR("abort, unable to alloc pseudo pallete\n"); 1083 IVTVFB_ERR("abort, unable to alloc pseudo palette\n");
1084 return -ENOMEM; 1084 return -ENOMEM;
1085 } 1085 }
1086 1086
diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c
index b1763ac93ab..8126622fb4f 100644
--- a/drivers/media/video/msp3400-driver.c
+++ b/drivers/media/video/msp3400-driver.c
@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
69/* module parameters */ 69/* module parameters */
70static int opmode = OPMODE_AUTO; 70static int opmode = OPMODE_AUTO;
71int msp_debug; /* msp_debug output */ 71int msp_debug; /* msp_debug output */
72int msp_once; /* no continous stereo monitoring */ 72int msp_once; /* no continuous stereo monitoring */
73int msp_amsound; /* hard-wire AM sound at 6.5 Hz (france), 73int msp_amsound; /* hard-wire AM sound at 6.5 Hz (france),
74 the autoscan seems work well only with FM... */ 74 the autoscan seems work well only with FM... */
75int msp_standard = 1; /* Override auto detect of audio msp_standard, 75int msp_standard = 1; /* Override auto detect of audio msp_standard,
@@ -551,7 +551,7 @@ static int msp_log_status(struct v4l2_subdev *sd)
551 switch (state->mode) { 551 switch (state->mode) {
552 case MSP_MODE_AM_DETECT: p = "AM (for carrier detect)"; break; 552 case MSP_MODE_AM_DETECT: p = "AM (for carrier detect)"; break;
553 case MSP_MODE_FM_RADIO: p = "FM Radio"; break; 553 case MSP_MODE_FM_RADIO: p = "FM Radio"; break;
554 case MSP_MODE_FM_TERRA: p = "Terrestial FM-mono/stereo"; break; 554 case MSP_MODE_FM_TERRA: p = "Terrestrial FM-mono/stereo"; break;
555 case MSP_MODE_FM_SAT: p = "Satellite FM-mono"; break; 555 case MSP_MODE_FM_SAT: p = "Satellite FM-mono"; break;
556 case MSP_MODE_FM_NICAM1: p = "NICAM/FM (B/G, D/K)"; break; 556 case MSP_MODE_FM_NICAM1: p = "NICAM/FM (B/G, D/K)"; break;
557 case MSP_MODE_FM_NICAM2: p = "NICAM/FM (I)"; break; 557 case MSP_MODE_FM_NICAM2: p = "NICAM/FM (I)"; break;
diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c
index b376fcdee65..80387e2c3ec 100644
--- a/drivers/media/video/msp3400-kthreads.c
+++ b/drivers/media/video/msp3400-kthreads.c
@@ -87,7 +87,7 @@ static struct msp3400c_init_data_dem {
87 {-8, -8, 4, 6, 78, 107}, 87 {-8, -8, 4, 6, 78, 107},
88 MSP_CARRIER(10.7), MSP_CARRIER(10.7), 88 MSP_CARRIER(10.7), MSP_CARRIER(10.7),
89 0x00d0, 0x0480, 0x0020, 0x3000 89 0x00d0, 0x0480, 0x0020, 0x3000
90 }, { /* Terrestial FM-mono + FM-stereo */ 90 }, { /* Terrestrial FM-mono + FM-stereo */
91 {3, 18, 27, 48, 66, 72}, 91 {3, 18, 27, 48, 66, 72},
92 {3, 18, 27, 48, 66, 72}, 92 {3, 18, 27, 48, 66, 72},
93 MSP_CARRIER(5.5), MSP_CARRIER(5.5), 93 MSP_CARRIER(5.5), MSP_CARRIER(5.5),
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 029a4babfd6..d4fe7bc92a1 100644
--- a/drivers/media/video/omap/omap_vout.c
+++ b/drivers/media/video/omap/omap_vout.c
@@ -473,7 +473,7 @@ static int omap_vout_vrfb_buffer_setup(struct omap_vout_device *vout,
473/* 473/*
474 * Convert V4L2 rotation to DSS rotation 474 * Convert V4L2 rotation to DSS rotation
475 * V4L2 understand 0, 90, 180, 270. 475 * V4L2 understand 0, 90, 180, 270.
476 * Convert to 0, 1, 2 and 3 repsectively for DSS 476 * Convert to 0, 1, 2 and 3 respectively for DSS
477 */ 477 */
478static int v4l2_rot_to_dss_rot(int v4l2_rotation, 478static int v4l2_rot_to_dss_rot(int v4l2_rotation,
479 enum dss_rotation *rotation, bool mirror) 479 enum dss_rotation *rotation, bool mirror)
@@ -1142,7 +1142,7 @@ static int omap_vout_buffer_prepare(struct videobuf_queue *q,
1142} 1142}
1143 1143
1144/* 1144/*
1145 * Buffer queue funtion will be called from the videobuf layer when _QBUF 1145 * Buffer queue function will be called from the videobuf layer when _QBUF
1146 * ioctl is called. It is used to enqueue buffer, which is ready to be 1146 * ioctl is called. It is used to enqueue buffer, which is ready to be
1147 * displayed. 1147 * displayed.
1148 */ 1148 */
diff --git a/drivers/media/video/omap/omap_voutlib.c b/drivers/media/video/omap/omap_voutlib.c
index b941c761eef..2aa6a76c5e5 100644
--- a/drivers/media/video/omap/omap_voutlib.c
+++ b/drivers/media/video/omap/omap_voutlib.c
@@ -53,7 +53,7 @@ EXPORT_SYMBOL_GPL(omap_vout_default_crop);
53/* Given a new render window in new_win, adjust the window to the 53/* Given a new render window in new_win, adjust the window to the
54 * nearest supported configuration. The adjusted window parameters are 54 * nearest supported configuration. The adjusted window parameters are
55 * returned in new_win. 55 * returned in new_win.
56 * Returns zero if succesful, or -EINVAL if the requested window is 56 * Returns zero if successful, or -EINVAL if the requested window is
57 * impossible and cannot reasonably be adjusted. 57 * impossible and cannot reasonably be adjusted.
58 */ 58 */
59int omap_vout_try_window(struct v4l2_framebuffer *fbuf, 59int omap_vout_try_window(struct v4l2_framebuffer *fbuf,
@@ -101,7 +101,7 @@ EXPORT_SYMBOL_GPL(omap_vout_try_window);
101 * will also be adjusted if necessary. Preference is given to keeping the 101 * will also be adjusted if necessary. Preference is given to keeping the
102 * the window as close to the requested configuration as possible. If 102 * the window as close to the requested configuration as possible. If
103 * successful, new_win, vout->win, and crop are updated. 103 * successful, new_win, vout->win, and crop are updated.
104 * Returns zero if succesful, or -EINVAL if the requested preview window is 104 * Returns zero if successful, or -EINVAL if the requested preview window is
105 * impossible and cannot reasonably be adjusted. 105 * impossible and cannot reasonably be adjusted.
106 */ 106 */
107int omap_vout_new_window(struct v4l2_rect *crop, 107int omap_vout_new_window(struct v4l2_rect *crop,
@@ -155,7 +155,7 @@ EXPORT_SYMBOL_GPL(omap_vout_new_window);
155 * window would fall outside the display boundaries, the cropping rectangle 155 * window would fall outside the display boundaries, the cropping rectangle
156 * will also be adjusted to maintain the rescaling ratios. If successful, crop 156 * will also be adjusted to maintain the rescaling ratios. If successful, crop
157 * and win are updated. 157 * and win are updated.
158 * Returns zero if succesful, or -EINVAL if the requested cropping rectangle is 158 * Returns zero if successful, or -EINVAL if the requested cropping rectangle is
159 * impossible and cannot reasonably be adjusted. 159 * impossible and cannot reasonably be adjusted.
160 */ 160 */
161int omap_vout_new_crop(struct v4l2_pix_format *pix, 161int omap_vout_new_crop(struct v4l2_pix_format *pix,
diff --git a/drivers/media/video/omap1_camera.c b/drivers/media/video/omap1_camera.c
index eab31cbd68e..5954b930663 100644
--- a/drivers/media/video/omap1_camera.c
+++ b/drivers/media/video/omap1_camera.c
@@ -687,7 +687,7 @@ static void videobuf_done(struct omap1_cam_dev *pcdev,
687 * In CONTIG mode, the current buffer parameters had already 687 * In CONTIG mode, the current buffer parameters had already
688 * been entered into the DMA programming register set while the 688 * been entered into the DMA programming register set while the
689 * buffer was fetched with prepare_next_vb(), they may have also 689 * buffer was fetched with prepare_next_vb(), they may have also
690 * been transfered into the runtime set and already active if 690 * been transferred into the runtime set and already active if
691 * the DMA still running. 691 * the DMA still running.
692 */ 692 */
693 } else { 693 } else {
@@ -835,7 +835,7 @@ static irqreturn_t cam_isr(int irq, void *data)
835 /* 835 /*
836 * If exactly 2 sgbufs from the next sglist have 836 * If exactly 2 sgbufs from the next sglist have
837 * been programmed into the DMA engine (the 837 * been programmed into the DMA engine (the
838 * frist one already transfered into the DMA 838 * first one already transferred into the DMA
839 * runtime register set, the second one still 839 * runtime register set, the second one still
840 * in the programming set), then we are in sync. 840 * in the programming set), then we are in sync.
841 */ 841 */
diff --git a/drivers/media/video/omap3isp/isp.c b/drivers/media/video/omap3isp/isp.c
index 1a9963bd6d4..503bd7922bd 100644
--- a/drivers/media/video/omap3isp/isp.c
+++ b/drivers/media/video/omap3isp/isp.c
@@ -715,7 +715,7 @@ static int isp_pipeline_link_notify(struct media_pad *source,
715 * Walk the entities chain starting at the pipeline output video node and start 715 * Walk the entities chain starting at the pipeline output video node and start
716 * all modules in the chain in the given mode. 716 * all modules in the chain in the given mode.
717 * 717 *
718 * Return 0 if successfull, or the return value of the failed video::s_stream 718 * Return 0 if successful, or the return value of the failed video::s_stream
719 * operation otherwise. 719 * operation otherwise.
720 */ 720 */
721static int isp_pipeline_enable(struct isp_pipeline *pipe, 721static int isp_pipeline_enable(struct isp_pipeline *pipe,
@@ -883,7 +883,7 @@ static int isp_pipeline_disable(struct isp_pipeline *pipe)
883 * Set the pipeline to the given stream state. Pipelines can be started in 883 * Set the pipeline to the given stream state. Pipelines can be started in
884 * single-shot or continuous mode. 884 * single-shot or continuous mode.
885 * 885 *
886 * Return 0 if successfull, or the return value of the failed video::s_stream 886 * Return 0 if successful, or the return value of the failed video::s_stream
887 * operation otherwise. 887 * operation otherwise.
888 */ 888 */
889int omap3isp_pipeline_set_stream(struct isp_pipeline *pipe, 889int omap3isp_pipeline_set_stream(struct isp_pipeline *pipe,
@@ -1283,7 +1283,7 @@ static void __isp_subclk_update(struct isp_device *isp)
1283 clk |= ISPCTRL_RSZ_CLK_EN; 1283 clk |= ISPCTRL_RSZ_CLK_EN;
1284 1284
1285 /* NOTE: For CCDC & Preview submodules, we need to affect internal 1285 /* NOTE: For CCDC & Preview submodules, we need to affect internal
1286 * RAM aswell. 1286 * RAM as well.
1287 */ 1287 */
1288 if (isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC) 1288 if (isp->subclk_resources & OMAP3_ISP_SUBCLK_CCDC)
1289 clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN; 1289 clk |= ISPCTRL_CCDC_CLK_EN | ISPCTRL_CCDC_RAM_EN;
@@ -1431,7 +1431,7 @@ static int isp_get_clocks(struct isp_device *isp)
1431 * Increment the reference count on the ISP. If the first reference is taken, 1431 * Increment the reference count on the ISP. If the first reference is taken,
1432 * enable clocks and power-up all submodules. 1432 * enable clocks and power-up all submodules.
1433 * 1433 *
1434 * Return a pointer to the ISP device structure, or NULL if an error occured. 1434 * Return a pointer to the ISP device structure, or NULL if an error occurred.
1435 */ 1435 */
1436struct isp_device *omap3isp_get(struct isp_device *isp) 1436struct isp_device *omap3isp_get(struct isp_device *isp)
1437{ 1437{
diff --git a/drivers/media/video/omap3isp/ispccdc.h b/drivers/media/video/omap3isp/ispccdc.h
index d403af5d31d..483a19cac1a 100644
--- a/drivers/media/video/omap3isp/ispccdc.h
+++ b/drivers/media/video/omap3isp/ispccdc.h
@@ -150,7 +150,7 @@ struct ispccdc_lsc {
150 * @input: Active input 150 * @input: Active input
151 * @output: Active outputs 151 * @output: Active outputs
152 * @video_out: Output video node 152 * @video_out: Output video node
153 * @error: A hardware error occured during capture 153 * @error: A hardware error occurred during capture
154 * @alaw: A-law compression enabled (1) or disabled (0) 154 * @alaw: A-law compression enabled (1) or disabled (0)
155 * @lpf: Low pass filter enabled (1) or disabled (0) 155 * @lpf: Low pass filter enabled (1) or disabled (0)
156 * @obclamp: Optical-black clamp enabled (1) or disabled (0) 156 * @obclamp: Optical-black clamp enabled (1) or disabled (0)
@@ -163,7 +163,7 @@ struct ispccdc_lsc {
163 * @shadow_update: Controls update in progress by userspace 163 * @shadow_update: Controls update in progress by userspace
164 * @syncif: Interface synchronization configuration 164 * @syncif: Interface synchronization configuration
165 * @vpcfg: Video port configuration 165 * @vpcfg: Video port configuration
166 * @underrun: A buffer underrun occured and a new buffer has been queued 166 * @underrun: A buffer underrun occurred and a new buffer has been queued
167 * @state: Streaming state 167 * @state: Streaming state
168 * @lock: Serializes shadow_update with interrupt handler 168 * @lock: Serializes shadow_update with interrupt handler
169 * @wait: Wait queue used to stop the module 169 * @wait: Wait queue used to stop the module
diff --git a/drivers/media/video/omap3isp/ispccp2.c b/drivers/media/video/omap3isp/ispccp2.c
index 0efef2e78d9..0e16cab8e08 100644
--- a/drivers/media/video/omap3isp/ispccp2.c
+++ b/drivers/media/video/omap3isp/ispccp2.c
@@ -772,7 +772,7 @@ static int ccp2_enum_frame_size(struct v4l2_subdev *sd,
772 * @sd : pointer to v4l2 subdev structure 772 * @sd : pointer to v4l2 subdev structure
773 * @fh : V4L2 subdev file handle 773 * @fh : V4L2 subdev file handle
774 * @fmt : pointer to v4l2 subdev format structure 774 * @fmt : pointer to v4l2 subdev format structure
775 * return -EINVAL or zero on sucess 775 * return -EINVAL or zero on success
776 */ 776 */
777static int ccp2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 777static int ccp2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
778 struct v4l2_subdev_format *fmt) 778 struct v4l2_subdev_format *fmt)
diff --git a/drivers/media/video/omap3isp/ispcsi2.c b/drivers/media/video/omap3isp/ispcsi2.c
index fb503f3db3b..69161a682b3 100644
--- a/drivers/media/video/omap3isp/ispcsi2.c
+++ b/drivers/media/video/omap3isp/ispcsi2.c
@@ -969,7 +969,7 @@ static int csi2_enum_frame_size(struct v4l2_subdev *sd,
969 * @sd : pointer to v4l2 subdev structure 969 * @sd : pointer to v4l2 subdev structure
970 * @fh : V4L2 subdev file handle 970 * @fh : V4L2 subdev file handle
971 * @fmt: pointer to v4l2 subdev format structure 971 * @fmt: pointer to v4l2 subdev format structure
972 * return -EINVAL or zero on sucess 972 * return -EINVAL or zero on success
973 */ 973 */
974static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 974static int csi2_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
975 struct v4l2_subdev_format *fmt) 975 struct v4l2_subdev_format *fmt)
diff --git a/drivers/media/video/omap3isp/isppreview.c b/drivers/media/video/omap3isp/isppreview.c
index baf9374201d..2b16988a501 100644
--- a/drivers/media/video/omap3isp/isppreview.c
+++ b/drivers/media/video/omap3isp/isppreview.c
@@ -34,7 +34,7 @@
34#include "ispreg.h" 34#include "ispreg.h"
35#include "isppreview.h" 35#include "isppreview.h"
36 36
37/* Default values in Office Flourescent Light for RGBtoRGB Blending */ 37/* Default values in Office Fluorescent Light for RGBtoRGB Blending */
38static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = { 38static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = {
39 { /* RGB-RGB Matrix */ 39 { /* RGB-RGB Matrix */
40 {0x01E2, 0x0F30, 0x0FEE}, 40 {0x01E2, 0x0F30, 0x0FEE},
@@ -44,7 +44,7 @@ static struct omap3isp_prev_rgbtorgb flr_rgb2rgb = {
44 {0x0000, 0x0000, 0x0000} 44 {0x0000, 0x0000, 0x0000}
45}; 45};
46 46
47/* Default values in Office Flourescent Light for RGB to YUV Conversion*/ 47/* Default values in Office Fluorescent Light for RGB to YUV Conversion*/
48static struct omap3isp_prev_csc flr_prev_csc = { 48static struct omap3isp_prev_csc flr_prev_csc = {
49 { /* CSC Coef Matrix */ 49 { /* CSC Coef Matrix */
50 {66, 129, 25}, 50 {66, 129, 25},
@@ -54,22 +54,22 @@ static struct omap3isp_prev_csc flr_prev_csc = {
54 {0x0, 0x0, 0x0} 54 {0x0, 0x0, 0x0}
55}; 55};
56 56
57/* Default values in Office Flourescent Light for CFA Gradient*/ 57/* Default values in Office Fluorescent Light for CFA Gradient*/
58#define FLR_CFA_GRADTHRS_HORZ 0x28 58#define FLR_CFA_GRADTHRS_HORZ 0x28
59#define FLR_CFA_GRADTHRS_VERT 0x28 59#define FLR_CFA_GRADTHRS_VERT 0x28
60 60
61/* Default values in Office Flourescent Light for Chroma Suppression*/ 61/* Default values in Office Fluorescent Light for Chroma Suppression*/
62#define FLR_CSUP_GAIN 0x0D 62#define FLR_CSUP_GAIN 0x0D
63#define FLR_CSUP_THRES 0xEB 63#define FLR_CSUP_THRES 0xEB
64 64
65/* Default values in Office Flourescent Light for Noise Filter*/ 65/* Default values in Office Fluorescent Light for Noise Filter*/
66#define FLR_NF_STRGTH 0x03 66#define FLR_NF_STRGTH 0x03
67 67
68/* Default values for White Balance */ 68/* Default values for White Balance */
69#define FLR_WBAL_DGAIN 0x100 69#define FLR_WBAL_DGAIN 0x100
70#define FLR_WBAL_COEF 0x20 70#define FLR_WBAL_COEF 0x20
71 71
72/* Default values in Office Flourescent Light for Black Adjustment*/ 72/* Default values in Office Fluorescent Light for Black Adjustment*/
73#define FLR_BLKADJ_BLUE 0x0 73#define FLR_BLKADJ_BLUE 0x0
74#define FLR_BLKADJ_GREEN 0x0 74#define FLR_BLKADJ_GREEN 0x0
75#define FLR_BLKADJ_RED 0x0 75#define FLR_BLKADJ_RED 0x0
@@ -137,7 +137,7 @@ preview_enable_invalaw(struct isp_prev_device *prev, u8 enable)
137 * @enable: 1 - Enable, 0 - Disable 137 * @enable: 1 - Enable, 0 - Disable
138 * 138 *
139 * NOTE: PRV_WSDR_ADDR and PRV_WADD_OFFSET must be set also 139 * NOTE: PRV_WSDR_ADDR and PRV_WADD_OFFSET must be set also
140 * The proccess is applied for each captured frame. 140 * The process is applied for each captured frame.
141 */ 141 */
142static void 142static void
143preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable) 143preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable)
@@ -157,7 +157,7 @@ preview_enable_drkframe_capture(struct isp_prev_device *prev, u8 enable)
157 * @enable: 1 - Acquires memory bandwidth since the pixels in each frame is 157 * @enable: 1 - Acquires memory bandwidth since the pixels in each frame is
158 * subtracted with the pixels in the current frame. 158 * subtracted with the pixels in the current frame.
159 * 159 *
160 * The proccess is applied for each captured frame. 160 * The process is applied for each captured frame.
161 */ 161 */
162static void 162static void
163preview_enable_drkframe(struct isp_prev_device *prev, u8 enable) 163preview_enable_drkframe(struct isp_prev_device *prev, u8 enable)
@@ -1528,7 +1528,7 @@ static long preview_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg)
1528 * preview_set_stream - Enable/Disable streaming on preview subdev 1528 * preview_set_stream - Enable/Disable streaming on preview subdev
1529 * @sd : pointer to v4l2 subdev structure 1529 * @sd : pointer to v4l2 subdev structure
1530 * @enable: 1 == Enable, 0 == Disable 1530 * @enable: 1 == Enable, 0 == Disable
1531 * return -EINVAL or zero on sucess 1531 * return -EINVAL or zero on success
1532 */ 1532 */
1533static int preview_set_stream(struct v4l2_subdev *sd, int enable) 1533static int preview_set_stream(struct v4l2_subdev *sd, int enable)
1534{ 1534{
@@ -1780,7 +1780,7 @@ static int preview_enum_frame_size(struct v4l2_subdev *sd,
1780 * @sd : pointer to v4l2 subdev structure 1780 * @sd : pointer to v4l2 subdev structure
1781 * @fh : V4L2 subdev file handle 1781 * @fh : V4L2 subdev file handle
1782 * @fmt: pointer to v4l2 subdev format structure 1782 * @fmt: pointer to v4l2 subdev format structure
1783 * return -EINVAL or zero on sucess 1783 * return -EINVAL or zero on success
1784 */ 1784 */
1785static int preview_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 1785static int preview_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
1786 struct v4l2_subdev_format *fmt) 1786 struct v4l2_subdev_format *fmt)
diff --git a/drivers/media/video/omap3isp/isppreview.h b/drivers/media/video/omap3isp/isppreview.h
index f2d63ca4bd6..fa943bd05c7 100644
--- a/drivers/media/video/omap3isp/isppreview.h
+++ b/drivers/media/video/omap3isp/isppreview.h
@@ -163,7 +163,7 @@ struct isptables_update {
163 * @output: Bitmask of the active output 163 * @output: Bitmask of the active output
164 * @video_in: Input video entity 164 * @video_in: Input video entity
165 * @video_out: Output video entity 165 * @video_out: Output video entity
166 * @error: A hardware error occured during capture 166 * @error: A hardware error occurred during capture
167 * @params: Module configuration data 167 * @params: Module configuration data
168 * @shadow_update: If set, update the hardware configured in the next interrupt 168 * @shadow_update: If set, update the hardware configured in the next interrupt
169 * @underrun: Whether the preview entity has queued buffers on the output 169 * @underrun: Whether the preview entity has queued buffers on the output
diff --git a/drivers/media/video/omap3isp/ispqueue.h b/drivers/media/video/omap3isp/ispqueue.h
index 251de3e1679..92c5a12157d 100644
--- a/drivers/media/video/omap3isp/ispqueue.h
+++ b/drivers/media/video/omap3isp/ispqueue.h
@@ -46,9 +46,9 @@ struct scatterlist;
46 * device yet. 46 * device yet.
47 * @ISP_BUF_STATE_ACTIVE: The buffer is in use for an active video transfer. 47 * @ISP_BUF_STATE_ACTIVE: The buffer is in use for an active video transfer.
48 * @ISP_BUF_STATE_ERROR: The device is done with the buffer and an error 48 * @ISP_BUF_STATE_ERROR: The device is done with the buffer and an error
49 * occured. For capture device the buffer likely contains corrupted data or 49 * occurred. For capture device the buffer likely contains corrupted data or
50 * no data at all. 50 * no data at all.
51 * @ISP_BUF_STATE_DONE: The device is done with the buffer and no error occured. 51 * @ISP_BUF_STATE_DONE: The device is done with the buffer and no error occurred.
52 * For capture devices the buffer contains valid data. 52 * For capture devices the buffer contains valid data.
53 */ 53 */
54enum isp_video_buffer_state { 54enum isp_video_buffer_state {
diff --git a/drivers/media/video/omap3isp/ispresizer.c b/drivers/media/video/omap3isp/ispresizer.c
index 75d39b115d4..653f88ba56d 100644
--- a/drivers/media/video/omap3isp/ispresizer.c
+++ b/drivers/media/video/omap3isp/ispresizer.c
@@ -751,7 +751,7 @@ static void resizer_print_status(struct isp_res_device *res)
751 * ratio will thus result in a resizing factor slightly larger than the 751 * ratio will thus result in a resizing factor slightly larger than the
752 * requested value. 752 * requested value.
753 * 753 *
754 * To accomodate that, and make sure the TRM equations are satisfied exactly, we 754 * To accommodate that, and make sure the TRM equations are satisfied exactly, we
755 * compute the input crop rectangle as the last step. 755 * compute the input crop rectangle as the last step.
756 * 756 *
757 * As if the situation wasn't complex enough, the maximum output width depends 757 * As if the situation wasn't complex enough, the maximum output width depends
@@ -1386,7 +1386,7 @@ static int resizer_enum_frame_size(struct v4l2_subdev *sd,
1386 * @sd : pointer to v4l2 subdev structure 1386 * @sd : pointer to v4l2 subdev structure
1387 * @fh : V4L2 subdev file handle 1387 * @fh : V4L2 subdev file handle
1388 * @fmt : pointer to v4l2 subdev format structure 1388 * @fmt : pointer to v4l2 subdev format structure
1389 * return -EINVAL or zero on sucess 1389 * return -EINVAL or zero on success
1390 */ 1390 */
1391static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh, 1391static int resizer_get_format(struct v4l2_subdev *sd, struct v4l2_subdev_fh *fh,
1392 struct v4l2_subdev_format *fmt) 1392 struct v4l2_subdev_format *fmt)
diff --git a/drivers/media/video/omap3isp/ispvideo.c b/drivers/media/video/omap3isp/ispvideo.c
index a0bb5db9cb8..208a7ec739d 100644
--- a/drivers/media/video/omap3isp/ispvideo.c
+++ b/drivers/media/video/omap3isp/ispvideo.c
@@ -494,12 +494,12 @@ static const struct isp_video_queue_operations isp_video_queue_ops = {
494/* 494/*
495 * omap3isp_video_buffer_next - Complete the current buffer and return the next 495 * omap3isp_video_buffer_next - Complete the current buffer and return the next
496 * @video: ISP video object 496 * @video: ISP video object
497 * @error: Whether an error occured during capture 497 * @error: Whether an error occurred during capture
498 * 498 *
499 * Remove the current video buffer from the DMA queue and fill its timestamp, 499 * Remove the current video buffer from the DMA queue and fill its timestamp,
500 * field count and state fields before waking up its completion handler. 500 * field count and state fields before waking up its completion handler.
501 * 501 *
502 * The buffer state is set to VIDEOBUF_DONE if no error occured (@error is 0) 502 * The buffer state is set to VIDEOBUF_DONE if no error occurred (@error is 0)
503 * or VIDEOBUF_ERROR otherwise (@error is non-zero). 503 * or VIDEOBUF_ERROR otherwise (@error is non-zero).
504 * 504 *
505 * The DMA queue is expected to contain at least one buffer. 505 * The DMA queue is expected to contain at least one buffer.
@@ -578,7 +578,7 @@ struct isp_buffer *omap3isp_video_buffer_next(struct isp_video *video,
578/* 578/*
579 * omap3isp_video_resume - Perform resume operation on the buffers 579 * omap3isp_video_resume - Perform resume operation on the buffers
580 * @video: ISP video object 580 * @video: ISP video object
581 * @continuous: Pipeline is in single shot mode if 0 or continous mode otherwise 581 * @continuous: Pipeline is in single shot mode if 0 or continuous mode otherwise
582 * 582 *
583 * This function is intended to be used on suspend/resume scenario. It 583 * This function is intended to be used on suspend/resume scenario. It
584 * requests video queue layer to discard buffers marked as DONE if it's in 584 * requests video queue layer to discard buffers marked as DONE if it's in
diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c
index fe8e3ebd9ce..456d9ad9ae5 100644
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@ -1038,7 +1038,7 @@ static int ov6650_reset(struct i2c_client *client)
1038 ret = ov6650_reg_rmw(client, REG_COMA, COMA_RESET, 0); 1038 ret = ov6650_reg_rmw(client, REG_COMA, COMA_RESET, 0);
1039 if (ret) 1039 if (ret)
1040 dev_err(&client->dev, 1040 dev_err(&client->dev,
1041 "An error occured while entering soft reset!\n"); 1041 "An error occurred while entering soft reset!\n");
1042 1042
1043 return ret; 1043 return ret;
1044} 1044}
diff --git a/drivers/media/video/ov9640.c b/drivers/media/video/ov9640.c
index 53d88a2ab92..5173ac449dd 100644
--- a/drivers/media/video/ov9640.c
+++ b/drivers/media/video/ov9640.c
@@ -273,7 +273,7 @@ static int ov9640_reset(struct i2c_client *client)
273 ret = ov9640_reg_write(client, OV9640_COM7, OV9640_COM7_SCCB_RESET); 273 ret = ov9640_reg_write(client, OV9640_COM7, OV9640_COM7_SCCB_RESET);
274 if (ret) 274 if (ret)
275 dev_err(&client->dev, 275 dev_err(&client->dev,
276 "An error occured while entering soft reset!\n"); 276 "An error occurred while entering soft reset!\n");
277 277
278 return ret; 278 return ret;
279} 279}
diff --git a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
index aeed1c2945f..9515f3a68f8 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
@@ -32,7 +32,7 @@
32 32
33 Read and analyze data in the eeprom. Use tveeprom to figure out 33 Read and analyze data in the eeprom. Use tveeprom to figure out
34 the packet structure, since this is another Hauppauge device and 34 the packet structure, since this is another Hauppauge device and
35 internally it has a family resemblence to ivtv-type devices 35 internally it has a family resemblance to ivtv-type devices
36 36
37*/ 37*/
38 38
diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.h b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
index 51d3009ab57..d7753ae9ff4 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-hdw.h
+++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.h
@@ -75,7 +75,7 @@ enum pvr2_v4l_type {
75 * (but it might still on the bus). In this state there's nothing we can 75 * (but it might still on the bus). In this state there's nothing we can
76 * do; it must be replugged in order to recover. 76 * do; it must be replugged in order to recover.
77 * 77 *
78 * COLD - Device is in an unusuable state, needs microcontroller firmware. 78 * COLD - Device is in an unusable state, needs microcontroller firmware.
79 * 79 *
80 * WARM - We can communicate with the device and the proper 80 * WARM - We can communicate with the device and the proper
81 * microcontroller firmware is running, but other device initialization is 81 * microcontroller firmware is running, but other device initialization is
diff --git a/drivers/media/video/pxa_camera.c b/drivers/media/video/pxa_camera.c
index 02686771740..c1ee09a043b 100644
--- a/drivers/media/video/pxa_camera.c
+++ b/drivers/media/video/pxa_camera.c
@@ -714,7 +714,7 @@ static void pxa_camera_wakeup(struct pxa_camera_dev *pcdev,
714 * 714 *
715 * The DMA chaining is done with DMA running. This means a tiny temporal window 715 * The DMA chaining is done with DMA running. This means a tiny temporal window
716 * remains, where a buffer is queued on the chain, while the chain is already 716 * remains, where a buffer is queued on the chain, while the chain is already
717 * stopped. This means the tailed buffer would never be transfered by DMA. 717 * stopped. This means the tailed buffer would never be transferred by DMA.
718 * This function restarts the capture for this corner case, where : 718 * This function restarts the capture for this corner case, where :
719 * - DADR() == DADDR_STOP 719 * - DADR() == DADDR_STOP
720 * - a videobuffer is queued on the pcdev->capture list 720 * - a videobuffer is queued on the pcdev->capture list
diff --git a/drivers/media/video/s5p-fimc/fimc-reg.c b/drivers/media/video/s5p-fimc/fimc-reg.c
index 4d929a39452..4893b2d91d8 100644
--- a/drivers/media/video/s5p-fimc/fimc-reg.c
+++ b/drivers/media/video/s5p-fimc/fimc-reg.c
@@ -356,7 +356,7 @@ void fimc_hw_en_capture(struct fimc_ctx *ctx)
356 /* one shot mode */ 356 /* one shot mode */
357 cfg |= S5P_CIIMGCPT_CPT_FREN_ENABLE | S5P_CIIMGCPT_IMGCPTEN; 357 cfg |= S5P_CIIMGCPT_CPT_FREN_ENABLE | S5P_CIIMGCPT_IMGCPTEN;
358 } else { 358 } else {
359 /* Continous frame capture mode (freerun). */ 359 /* Continuous frame capture mode (freerun). */
360 cfg &= ~(S5P_CIIMGCPT_CPT_FREN_ENABLE | 360 cfg &= ~(S5P_CIIMGCPT_CPT_FREN_ENABLE |
361 S5P_CIIMGCPT_CPT_FRMOD_CNT); 361 S5P_CIIMGCPT_CPT_FRMOD_CNT);
362 cfg |= S5P_CIIMGCPT_IMGCPTEN; 362 cfg |= S5P_CIIMGCPT_IMGCPTEN;
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 61c6007c8ea..50f1be05ebd 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -7460,7 +7460,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
7460 dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3; 7460 dev->tuner_type = TUNER_PHILIPS_FM1216ME_MK3;
7461 break; 7461 break;
7462 default: 7462 default:
7463 printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t); 7463 printk(KERN_ERR "%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t);
7464 } 7464 }
7465 } else if ((data[1] != 0) && (data[1] != 0xff)) { 7465 } else if ((data[1] != 0) && (data[1] != 0xff)) {
7466 /* new config structure */ 7466 /* new config structure */
@@ -7480,7 +7480,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
7480 printk(KERN_INFO "%s Board has DVB-T\n", dev->name); 7480 printk(KERN_INFO "%s Board has DVB-T\n", dev->name);
7481 break; 7481 break;
7482 default: 7482 default:
7483 printk(KERN_ERR "%s Cant determine tuner type %x from EEPROM\n", dev->name, tuner_t); 7483 printk(KERN_ERR "%s Can't determine tuner type %x from EEPROM\n", dev->name, tuner_t);
7484 } 7484 }
7485 } else { 7485 } else {
7486 printk(KERN_ERR "%s unexpected config structure\n", dev->name); 7486 printk(KERN_ERR "%s unexpected config structure\n", dev->name);
diff --git a/drivers/media/video/saa7164/saa7164-cmd.c b/drivers/media/video/saa7164/saa7164-cmd.c
index 6a4c217ed3a..62fac7f9d04 100644
--- a/drivers/media/video/saa7164/saa7164-cmd.c
+++ b/drivers/media/video/saa7164/saa7164-cmd.c
@@ -257,7 +257,7 @@ out:
257} 257}
258 258
259/* Wait for a signal event, without holding a mutex. Either return TIMEOUT if 259/* Wait for a signal event, without holding a mutex. Either return TIMEOUT if
260 * the event never occured, or SAA_OK if it was signaled during the wait. 260 * the event never occurred, or SAA_OK if it was signaled during the wait.
261 */ 261 */
262int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno) 262int saa7164_cmd_wait(struct saa7164_dev *dev, u8 seqno)
263{ 263{
diff --git a/drivers/media/video/saa7164/saa7164-fw.c b/drivers/media/video/saa7164/saa7164-fw.c
index b369300cce0..a266bf0169e 100644
--- a/drivers/media/video/saa7164/saa7164-fw.c
+++ b/drivers/media/video/saa7164/saa7164-fw.c
@@ -444,7 +444,7 @@ int saa7164_downloadfirmware(struct saa7164_dev *dev)
444 printk(KERN_INFO " .Reserved = 0x%x\n", hdr->reserved); 444 printk(KERN_INFO " .Reserved = 0x%x\n", hdr->reserved);
445 printk(KERN_INFO " .Version = 0x%x\n", hdr->version); 445 printk(KERN_INFO " .Version = 0x%x\n", hdr->version);
446 446
447 /* Retreive bootloader if reqd */ 447 /* Retrieve bootloader if reqd */
448 if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0)) 448 if ((hdr->firmwaresize == 0) && (hdr->bslsize == 0))
449 /* Second bootloader in the firmware file */ 449 /* Second bootloader in the firmware file */
450 filesize = hdr->reserved * 16; 450 filesize = hdr->reserved * 16;
diff --git a/drivers/media/video/saa7164/saa7164-types.h b/drivers/media/video/saa7164/saa7164-types.h
index df1d2997fa6..1d2140a3eb3 100644
--- a/drivers/media/video/saa7164/saa7164-types.h
+++ b/drivers/media/video/saa7164/saa7164-types.h
@@ -412,7 +412,7 @@ struct tmComResVBIFormatDescrHeader {
412 u8 StartLine; /* NTSC Start = 10 */ 412 u8 StartLine; /* NTSC Start = 10 */
413 u8 EndLine; /* NTSC = 21 */ 413 u8 EndLine; /* NTSC = 21 */
414 u8 FieldRate; /* 60 for NTSC */ 414 u8 FieldRate; /* 60 for NTSC */
415 u8 bNumLines; /* Unsed - scheduled for removal */ 415 u8 bNumLines; /* Unused - scheduled for removal */
416} __attribute__((packed)); 416} __attribute__((packed));
417 417
418struct tmComResProbeCommit { 418struct tmComResProbeCommit {
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index ce56a1cdbf0..0e07c493e6f 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -1810,7 +1810,7 @@ static int sn9c102_open(struct file *filp)
1810 /* 1810 /*
1811 We will not release the "open_mutex" lock, so that only one 1811 We will not release the "open_mutex" lock, so that only one
1812 process can be in the wait queue below. This way the process 1812 process can be in the wait queue below. This way the process
1813 will be sleeping while holding the lock, without loosing its 1813 will be sleeping while holding the lock, without losing its
1814 priority after any wake_up(). 1814 priority after any wake_up().
1815 */ 1815 */
1816 err = wait_event_interruptible_exclusive(cam->wait_open, 1816 err = wait_event_interruptible_exclusive(cam->wait_open,
diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h
index 7f38549715b..3679970dba2 100644
--- a/drivers/media/video/sn9c102/sn9c102_sensor.h
+++ b/drivers/media/video/sn9c102/sn9c102_sensor.h
@@ -180,7 +180,7 @@ struct sn9c102_sensor {
180 It should be used to initialize the sensor only, but may also 180 It should be used to initialize the sensor only, but may also
181 configure part of the SN9C1XX chip if necessary. You don't need to 181 configure part of the SN9C1XX chip if necessary. You don't need to
182 setup picture settings like brightness, contrast, etc.. here, if 182 setup picture settings like brightness, contrast, etc.. here, if
183 the corrisponding controls are implemented (see below), since 183 the corresponding controls are implemented (see below), since
184 they are adjusted in the core driver by calling the set_ctrl() 184 they are adjusted in the core driver by calling the set_ctrl()
185 method after init(), where the arguments are the default values 185 method after init(), where the arguments are the default values
186 specified in the v4l2_queryctrl list of supported controls; 186 specified in the v4l2_queryctrl list of supported controls;
diff --git a/drivers/media/video/tcm825x.c b/drivers/media/video/tcm825x.c
index 54681a53582..b6ee1bd342d 100644
--- a/drivers/media/video/tcm825x.c
+++ b/drivers/media/video/tcm825x.c
@@ -493,7 +493,7 @@ static int ioctl_g_ctrl(struct v4l2_int_device *s,
493 int val, r; 493 int val, r;
494 struct vcontrol *lvc; 494 struct vcontrol *lvc;
495 495
496 /* exposure time is special, spread accross 2 registers */ 496 /* exposure time is special, spread across 2 registers */
497 if (vc->id == V4L2_CID_EXPOSURE) { 497 if (vc->id == V4L2_CID_EXPOSURE) {
498 int val_lower, val_upper; 498 int val_lower, val_upper;
499 499
@@ -538,7 +538,7 @@ static int ioctl_s_ctrl(struct v4l2_int_device *s,
538 struct vcontrol *lvc; 538 struct vcontrol *lvc;
539 int val = vc->value; 539 int val = vc->value;
540 540
541 /* exposure time is special, spread accross 2 registers */ 541 /* exposure time is special, spread across 2 registers */
542 if (vc->id == V4L2_CID_EXPOSURE) { 542 if (vc->id == V4L2_CID_EXPOSURE) {
543 int val_lower, val_upper; 543 int val_lower, val_upper;
544 val_lower = val & TCM825X_MASK(TCM825X_ESRSPD_L); 544 val_lower = val & TCM825X_MASK(TCM825X_ESRSPD_L);
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
index a25e2b5e194..c46a3bb9585 100644
--- a/drivers/media/video/tvaudio.c
+++ b/drivers/media/video/tvaudio.c
@@ -1058,11 +1058,11 @@ static int tda9874a_initialize(struct CHIPSTATE *chip)
1058#define TDA9875_MVR 0x1b /* Main volume droite */ 1058#define TDA9875_MVR 0x1b /* Main volume droite */
1059#define TDA9875_MBA 0x1d /* Main Basse */ 1059#define TDA9875_MBA 0x1d /* Main Basse */
1060#define TDA9875_MTR 0x1e /* Main treble */ 1060#define TDA9875_MTR 0x1e /* Main treble */
1061#define TDA9875_ACS 0x1f /* Auxilary channel select (FM) 0b0000000*/ 1061#define TDA9875_ACS 0x1f /* Auxiliary channel select (FM) 0b0000000*/
1062#define TDA9875_AVL 0x20 /* Auxilary volume gauche */ 1062#define TDA9875_AVL 0x20 /* Auxiliary volume gauche */
1063#define TDA9875_AVR 0x21 /* Auxilary volume droite */ 1063#define TDA9875_AVR 0x21 /* Auxiliary volume droite */
1064#define TDA9875_ABA 0x22 /* Auxilary Basse */ 1064#define TDA9875_ABA 0x22 /* Auxiliary Basse */
1065#define TDA9875_ATR 0x23 /* Auxilary treble */ 1065#define TDA9875_ATR 0x23 /* Auxiliary treble */
1066 1066
1067#define TDA9875_MSR 0x02 /* Monitor select register */ 1067#define TDA9875_MSR 0x02 /* Monitor select register */
1068#define TDA9875_C1MSB 0x03 /* Carrier 1 (FM) frequency register MSB */ 1068#define TDA9875_C1MSB 0x03 /* Carrier 1 (FM) frequency register MSB */
diff --git a/drivers/media/video/uvc/uvc_video.c b/drivers/media/video/uvc/uvc_video.c
index 545c0294813..fc766b9f24c 100644
--- a/drivers/media/video/uvc/uvc_video.c
+++ b/drivers/media/video/uvc/uvc_video.c
@@ -394,11 +394,11 @@ int uvc_commit_video(struct uvc_streaming *stream,
394 * 394 *
395 * uvc_video_decode_end is called with header data at the end of a bulk or 395 * uvc_video_decode_end is called with header data at the end of a bulk or
396 * isochronous payload. It performs any additional header data processing and 396 * isochronous payload. It performs any additional header data processing and
397 * returns 0 or a negative error code if an error occured. As header data have 397 * returns 0 or a negative error code if an error occurred. As header data have
398 * already been processed by uvc_video_decode_start, this functions isn't 398 * already been processed by uvc_video_decode_start, this functions isn't
399 * required to perform sanity checks a second time. 399 * required to perform sanity checks a second time.
400 * 400 *
401 * For isochronous transfers where a payload is always transfered in a single 401 * For isochronous transfers where a payload is always transferred in a single
402 * URB, the three functions will be called in a row. 402 * URB, the three functions will be called in a row.
403 * 403 *
404 * To let the decoder process header data and update its internal state even 404 * To let the decoder process header data and update its internal state even
@@ -658,7 +658,7 @@ static void uvc_video_decode_bulk(struct urb *urb, struct uvc_streaming *stream,
658 buf); 658 buf);
659 } while (ret == -EAGAIN); 659 } while (ret == -EAGAIN);
660 660
661 /* If an error occured skip the rest of the payload. */ 661 /* If an error occurred skip the rest of the payload. */
662 if (ret < 0 || buf == NULL) { 662 if (ret < 0 || buf == NULL) {
663 stream->bulk.skip_payload = 1; 663 stream->bulk.skip_payload = 1;
664 } else { 664 } else {
@@ -821,7 +821,7 @@ static int uvc_alloc_urb_buffers(struct uvc_streaming *stream,
821 return stream->urb_size / psize; 821 return stream->urb_size / psize;
822 822
823 /* Compute the number of packets. Bulk endpoints might transfer UVC 823 /* Compute the number of packets. Bulk endpoints might transfer UVC
824 * payloads accross multiple URBs. 824 * payloads across multiple URBs.
825 */ 825 */
826 npackets = DIV_ROUND_UP(size, psize); 826 npackets = DIV_ROUND_UP(size, psize);
827 if (npackets > UVC_MAX_PACKETS) 827 if (npackets > UVC_MAX_PACKETS)
diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c
index a01ed39e6c1..506edcc2dde 100644
--- a/drivers/media/video/v4l2-ioctl.c
+++ b/drivers/media/video/v4l2-ioctl.c
@@ -48,7 +48,7 @@
48 printk(KERN_CONT "%s: " fmt, vfd->name, ## arg);\ 48 printk(KERN_CONT "%s: " fmt, vfd->name, ## arg);\
49 } while (0) 49 } while (0)
50 50
51/* Zero out the end of the struct pointed to by p. Everthing after, but 51/* Zero out the end of the struct pointed to by p. Everything after, but
52 * not including, the specified field is cleared. */ 52 * not including, the specified field is cleared. */
53#define CLEAR_AFTER_FIELD(p, field) \ 53#define CLEAR_AFTER_FIELD(p, field) \
54 memset((u8 *)(p) + offsetof(typeof(*(p)), field) + sizeof((p)->field), \ 54 memset((u8 *)(p) + offsetof(typeof(*(p)), field) + sizeof((p)->field), \
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 75301d10a83..ca372eb911d 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -354,7 +354,7 @@ static int vpx3220_s_std(struct v4l2_subdev *sd, v4l2_std_id std)
354 354
355 /* Here we back up the input selection because it gets 355 /* Here we back up the input selection because it gets
356 overwritten when we fill the registers with the 356 overwritten when we fill the registers with the
357 choosen video norm */ 357 chosen video norm */
358 temp_input = vpx3220_fp_read(sd, 0xf2); 358 temp_input = vpx3220_fp_read(sd, 0xf2);
359 359
360 v4l2_dbg(1, debug, sd, "s_std %llx\n", (unsigned long long)std); 360 v4l2_dbg(1, debug, sd, "s_std %llx\n", (unsigned long long)std);
diff --git a/drivers/media/video/zoran/videocodec.h b/drivers/media/video/zoran/videocodec.h
index b654bfff874..def55585ad2 100644
--- a/drivers/media/video/zoran/videocodec.h
+++ b/drivers/media/video/zoran/videocodec.h
@@ -57,7 +57,7 @@
57 therfor they may not be initialized. 57 therfor they may not be initialized.
58 58
59 The other functions are just for convenience, as they are for sure used by 59 The other functions are just for convenience, as they are for sure used by
60 most/all of the codecs. The last ones may be ommited, too. 60 most/all of the codecs. The last ones may be omitted, too.
61 61
62 See the structure declaration below for more information and which data has 62 See the structure declaration below for more information and which data has
63 to be set up for the master and the slave. 63 to be set up for the master and the slave.
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h
index 4bb368e6fd4..f3f64001492 100644
--- a/drivers/media/video/zoran/zoran.h
+++ b/drivers/media/video/zoran/zoran.h
@@ -259,7 +259,7 @@ struct card_info {
259 struct vfe_polarity vfe_pol; 259 struct vfe_polarity vfe_pol;
260 u8 gpio_pol[ZR_GPIO_MAX]; 260 u8 gpio_pol[ZR_GPIO_MAX];
261 261
262 /* is the /GWS line conected? */ 262 /* is the /GWS line connected? */
263 u8 gws_not_connected; 263 u8 gws_not_connected;
264 264
265 /* avs6eyes mux setting */ 265 /* avs6eyes mux setting */
diff --git a/drivers/media/video/zoran/zoran_driver.c b/drivers/media/video/zoran/zoran_driver.c
index 7c3921de958..2771d818406 100644
--- a/drivers/media/video/zoran/zoran_driver.c
+++ b/drivers/media/video/zoran/zoran_driver.c
@@ -1254,7 +1254,7 @@ static int setup_overlay(struct zoran_fh *fh, int on)
1254{ 1254{
1255 struct zoran *zr = fh->zr; 1255 struct zoran *zr = fh->zr;
1256 1256
1257 /* If there is nothing to do, return immediatly */ 1257 /* If there is nothing to do, return immediately */
1258 if ((on && fh->overlay_active != ZORAN_FREE) || 1258 if ((on && fh->overlay_active != ZORAN_FREE) ||
1259 (!on && fh->overlay_active == ZORAN_FREE)) 1259 (!on && fh->overlay_active == ZORAN_FREE))
1260 return 0; 1260 return 0;