diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/gspca/sunplus.c | 4 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/vicam.c | 2 | ||||
-rw-r--r-- | drivers/media/video/v4l2-compat-ioctl32.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zoran/zoran.h | 2 | ||||
-rw-r--r-- | drivers/media/video/zoran/zoran_device.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zoran/zr36050.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zoran/zr36060.c | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/media/video/gspca/sunplus.c b/drivers/media/video/gspca/sunplus.c index 0c786e00ebcf..d0a133abe767 100644 --- a/drivers/media/video/gspca/sunplus.c +++ b/drivers/media/video/gspca/sunplus.c | |||
@@ -805,7 +805,7 @@ static int sd_init(struct gspca_dev *gspca_dev) | |||
805 | /* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */ | 805 | /* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */ |
806 | spca504A_acknowledged_command(gspca_dev, 0x24, | 806 | spca504A_acknowledged_command(gspca_dev, 0x24, |
807 | 8, 3, 0x9e, 1); | 807 | 8, 3, 0x9e, 1); |
808 | /* Twice sequencial need status 0xff->0x9e->0x9d */ | 808 | /* Twice sequential need status 0xff->0x9e->0x9d */ |
809 | spca504A_acknowledged_command(gspca_dev, 0x24, | 809 | spca504A_acknowledged_command(gspca_dev, 0x24, |
810 | 8, 3, 0x9e, 0); | 810 | 8, 3, 0x9e, 0); |
811 | 811 | ||
@@ -880,7 +880,7 @@ static int sd_start(struct gspca_dev *gspca_dev) | |||
880 | /* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */ | 880 | /* Set AE AWB Banding Type 3-> 50Hz 2-> 60Hz */ |
881 | spca504A_acknowledged_command(gspca_dev, 0x24, | 881 | spca504A_acknowledged_command(gspca_dev, 0x24, |
882 | 8, 3, 0x9e, 1); | 882 | 8, 3, 0x9e, 1); |
883 | /* Twice sequencial need status 0xff->0x9e->0x9d */ | 883 | /* Twice sequential need status 0xff->0x9e->0x9d */ |
884 | spca504A_acknowledged_command(gspca_dev, 0x24, | 884 | spca504A_acknowledged_command(gspca_dev, 0x24, |
885 | 8, 3, 0x9e, 0); | 885 | 8, 3, 0x9e, 0); |
886 | spca504A_acknowledged_command(gspca_dev, 0x24, | 886 | spca504A_acknowledged_command(gspca_dev, 0x24, |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index 6030410c6677..5d6fd01f918a 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * USB ViCam WebCam driver | 2 | * USB ViCam WebCam driver |
3 | * Copyright (c) 2002 Joe Burks (jburks@wavicle.org), | 3 | * Copyright (c) 2002 Joe Burks (jburks@wavicle.org), |
4 | * Christopher L Cheney (ccheney@cheney.cx), | 4 | * Christopher L Cheney (ccheney@cheney.cx), |
5 | * Pavel Machek (pavel@suse.cz), | 5 | * Pavel Machek (pavel@ucw.cz), |
6 | * John Tyner (jtyner@cs.ucr.edu), | 6 | * John Tyner (jtyner@cs.ucr.edu), |
7 | * Monroe Williams (monroe@pobox.com) | 7 | * Monroe Williams (monroe@pobox.com) |
8 | * | 8 | * |
diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c index 9004a5fe7643..d2f20c2acae2 100644 --- a/drivers/media/video/v4l2-compat-ioctl32.c +++ b/drivers/media/video/v4l2-compat-ioctl32.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * Copyright (C) 1997-2000 Jakub Jelinek (jakub@redhat.com) | 5 | * Copyright (C) 1997-2000 Jakub Jelinek (jakub@redhat.com) |
6 | * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) | 6 | * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be) |
7 | * Copyright (C) 2001,2002 Andi Kleen, SuSE Labs | 7 | * Copyright (C) 2001,2002 Andi Kleen, SuSE Labs |
8 | * Copyright (C) 2003 Pavel Machek (pavel@suse.cz) | 8 | * Copyright (C) 2003 Pavel Machek (pavel@ucw.cz) |
9 | * Copyright (C) 2005 Philippe De Muyter (phdm@macqel.be) | 9 | * Copyright (C) 2005 Philippe De Muyter (phdm@macqel.be) |
10 | * Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl> | 10 | * Copyright (C) 2008 Hans Verkuil <hverkuil@xs4all.nl> |
11 | * | 11 | * |
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h index 8997add1248e..307e847fe1cd 100644 --- a/drivers/media/video/zoran/zoran.h +++ b/drivers/media/video/zoran/zoran.h | |||
@@ -391,7 +391,7 @@ struct zoran { | |||
391 | 391 | ||
392 | struct mutex resource_lock; /* prevent evil stuff */ | 392 | struct mutex resource_lock; /* prevent evil stuff */ |
393 | 393 | ||
394 | u8 initialized; /* flag if zoran has been correctly initalized */ | 394 | u8 initialized; /* flag if zoran has been correctly initialized */ |
395 | int user; /* number of current users */ | 395 | int user; /* number of current users */ |
396 | struct card_info card; | 396 | struct card_info card; |
397 | struct tvnorm *timing; | 397 | struct tvnorm *timing; |
diff --git a/drivers/media/video/zoran/zoran_device.c b/drivers/media/video/zoran/zoran_device.c index e6ad4b205611..6f846abee3e4 100644 --- a/drivers/media/video/zoran/zoran_device.c +++ b/drivers/media/video/zoran/zoran_device.c | |||
@@ -484,7 +484,7 @@ zr36057_overlay (struct zoran *zr, | |||
484 | zr->overlay_settings.format); | 484 | zr->overlay_settings.format); |
485 | 485 | ||
486 | /* Start and length of each line MUST be 4-byte aligned. | 486 | /* Start and length of each line MUST be 4-byte aligned. |
487 | * This should be allready checked before the call to this routine. | 487 | * This should be already checked before the call to this routine. |
488 | * All error messages are internal driver checking only! */ | 488 | * All error messages are internal driver checking only! */ |
489 | 489 | ||
490 | /* video display top and bottom registers */ | 490 | /* video display top and bottom registers */ |
diff --git a/drivers/media/video/zoran/zr36050.c b/drivers/media/video/zoran/zr36050.c index 639dd87c663f..e1985609af4b 100644 --- a/drivers/media/video/zoran/zr36050.c +++ b/drivers/media/video/zoran/zr36050.c | |||
@@ -236,7 +236,7 @@ zr36050_pushit (struct zr36050 *ptr, | |||
236 | 236 | ||
237 | Could be variable, but until it's not needed it they are just fixed to save | 237 | Could be variable, but until it's not needed it they are just fixed to save |
238 | memory. Otherwise expand zr36050 structure with arrays, push the values to | 238 | memory. Otherwise expand zr36050 structure with arrays, push the values to |
239 | it and initalize from there, as e.g. the linux zr36057/60 driver does it. | 239 | it and initialize from there, as e.g. the linux zr36057/60 driver does it. |
240 | ========================================================================= */ | 240 | ========================================================================= */ |
241 | 241 | ||
242 | static const char zr36050_dqt[0x86] = { | 242 | static const char zr36050_dqt[0x86] = { |
diff --git a/drivers/media/video/zoran/zr36060.c b/drivers/media/video/zoran/zr36060.c index 008746ff7746..5e4f57cbf314 100644 --- a/drivers/media/video/zoran/zr36060.c +++ b/drivers/media/video/zoran/zr36060.c | |||
@@ -227,7 +227,7 @@ zr36060_pushit (struct zr36060 *ptr, | |||
227 | 227 | ||
228 | Could be variable, but until it's not needed it they are just fixed to save | 228 | Could be variable, but until it's not needed it they are just fixed to save |
229 | memory. Otherwise expand zr36060 structure with arrays, push the values to | 229 | memory. Otherwise expand zr36060 structure with arrays, push the values to |
230 | it and initalize from there, as e.g. the linux zr36057/60 driver does it. | 230 | it and initialize from there, as e.g. the linux zr36057/60 driver does it. |
231 | ========================================================================= */ | 231 | ========================================================================= */ |
232 | 232 | ||
233 | static const char zr36060_dqt[0x86] = { | 233 | static const char zr36060_dqt[0x86] = { |