diff options
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/cx25840/cx25840-ir.c | 2 | ||||
-rw-r--r-- | drivers/media/video/davinci/vpif.h | 2 | ||||
-rw-r--r-- | drivers/media/video/davinci/vpss.c | 2 | ||||
-rw-r--r-- | drivers/media/video/omap/omap_vout.c | 2 | ||||
-rw-r--r-- | drivers/media/video/saa7164/saa7164-core.c | 4 | ||||
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_sensor.h | 2 | ||||
-rw-r--r-- | drivers/media/video/via-camera.c | 2 | ||||
-rw-r--r-- | drivers/media/video/zoran/zoran.h | 2 |
8 files changed, 8 insertions, 10 deletions
diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c index 97a4e9b25fe4..a9d83b5d0e49 100644 --- a/drivers/media/video/cx25840/cx25840-ir.c +++ b/drivers/media/video/cx25840/cx25840-ir.c | |||
@@ -261,7 +261,7 @@ static u16 ns_to_pulse_width_count(u32 ns, u16 divider) | |||
261 | u32 rem; | 261 | u32 rem; |
262 | 262 | ||
263 | /* | 263 | /* |
264 | * The 2 lsb's of the pulse width timer count are not accessable, hence | 264 | * The 2 lsb's of the pulse width timer count are not accessible, hence |
265 | * the (1 << 2) | 265 | * the (1 << 2) |
266 | */ | 266 | */ |
267 | n = ((u64) ns) * CX25840_IR_REFCLK_FREQ / 1000000; /* millicycles */ | 267 | n = ((u64) ns) * CX25840_IR_REFCLK_FREQ / 1000000; /* millicycles */ |
diff --git a/drivers/media/video/davinci/vpif.h b/drivers/media/video/davinci/vpif.h index 188841b476e0..ebd5c4338ebb 100644 --- a/drivers/media/video/davinci/vpif.h +++ b/drivers/media/video/davinci/vpif.h | |||
@@ -33,7 +33,7 @@ extern spinlock_t vpif_lock; | |||
33 | #define regr(reg) readl((reg) + vpif_base) | 33 | #define regr(reg) readl((reg) + vpif_base) |
34 | #define regw(value, reg) writel(value, (reg + vpif_base)) | 34 | #define regw(value, reg) writel(value, (reg + vpif_base)) |
35 | 35 | ||
36 | /* Register Addresss Offsets */ | 36 | /* Register Address Offsets */ |
37 | #define VPIF_PID (0x0000) | 37 | #define VPIF_PID (0x0000) |
38 | #define VPIF_CH0_CTRL (0x0004) | 38 | #define VPIF_CH0_CTRL (0x0004) |
39 | #define VPIF_CH1_CTRL (0x0008) | 39 | #define VPIF_CH1_CTRL (0x0008) |
diff --git a/drivers/media/video/davinci/vpss.c b/drivers/media/video/davinci/vpss.c index 7918680917d0..3e5cf27ec2b2 100644 --- a/drivers/media/video/davinci/vpss.c +++ b/drivers/media/video/davinci/vpss.c | |||
@@ -85,7 +85,7 @@ enum vpss_platform_type { | |||
85 | /* | 85 | /* |
86 | * vpss operations. Depends on platform. Not all functions are available | 86 | * vpss operations. Depends on platform. Not all functions are available |
87 | * on all platforms. The api, first check if a functio is available before | 87 | * on all platforms. The api, first check if a functio is available before |
88 | * invoking it. In the probe, the function ptrs are intialized based on | 88 | * invoking it. In the probe, the function ptrs are initialized based on |
89 | * vpss name. vpss name can be "dm355_vpss", "dm644x_vpss" etc. | 89 | * vpss name. vpss name can be "dm355_vpss", "dm644x_vpss" etc. |
90 | */ | 90 | */ |
91 | struct vpss_hw_ops { | 91 | struct vpss_hw_ops { |
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c index 15f8793e325b..21d7c0d8f51f 100644 --- a/drivers/media/video/omap/omap_vout.c +++ b/drivers/media/video/omap/omap_vout.c | |||
@@ -1286,7 +1286,7 @@ static int omap_vout_release(struct file *file) | |||
1286 | videobuf_mmap_free(q); | 1286 | videobuf_mmap_free(q); |
1287 | 1287 | ||
1288 | /* Even if apply changes fails we should continue | 1288 | /* Even if apply changes fails we should continue |
1289 | freeing allocated memeory */ | 1289 | freeing allocated memory */ |
1290 | if (vout->streaming) { | 1290 | if (vout->streaming) { |
1291 | u32 mask = 0; | 1291 | u32 mask = 0; |
1292 | 1292 | ||
diff --git a/drivers/media/video/saa7164/saa7164-core.c b/drivers/media/video/saa7164/saa7164-core.c index e1bac5051460..cdd8e348a543 100644 --- a/drivers/media/video/saa7164/saa7164-core.c +++ b/drivers/media/video/saa7164/saa7164-core.c | |||
@@ -653,8 +653,8 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id) | |||
653 | goto out; | 653 | goto out; |
654 | } | 654 | } |
655 | 655 | ||
656 | /* Check that the hardware is accessable. If the status bytes are | 656 | /* Check that the hardware is accessible. If the status bytes are |
657 | * 0xFF then the device is not accessable, the the IRQ belongs | 657 | * 0xFF then the device is not accessible, the the IRQ belongs |
658 | * to another driver. | 658 | * to another driver. |
659 | * 4 x u32 interrupt registers. | 659 | * 4 x u32 interrupt registers. |
660 | */ | 660 | */ |
diff --git a/drivers/media/video/sn9c102/sn9c102_sensor.h b/drivers/media/video/sn9c102/sn9c102_sensor.h index 494957b10bac..7f38549715b6 100644 --- a/drivers/media/video/sn9c102/sn9c102_sensor.h +++ b/drivers/media/video/sn9c102/sn9c102_sensor.h | |||
@@ -147,7 +147,7 @@ enum sn9c102_i2c_interface { | |||
147 | 147 | ||
148 | struct sn9c102_sensor { | 148 | struct sn9c102_sensor { |
149 | char name[32], /* sensor name */ | 149 | char name[32], /* sensor name */ |
150 | maintainer[64]; /* name of the mantainer <email> */ | 150 | maintainer[64]; /* name of the maintainer <email> */ |
151 | 151 | ||
152 | enum sn9c102_bridge supported_bridge; /* supported SN9C1xx bridges */ | 152 | enum sn9c102_bridge supported_bridge; /* supported SN9C1xx bridges */ |
153 | 153 | ||
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c index 9eda7cc03121..222e72db0445 100644 --- a/drivers/media/video/via-camera.c +++ b/drivers/media/video/via-camera.c | |||
@@ -13,14 +13,12 @@ | |||
13 | #include <linux/pci.h> | 13 | #include <linux/pci.h> |
14 | #include <linux/gpio.h> | 14 | #include <linux/gpio.h> |
15 | #include <linux/interrupt.h> | 15 | #include <linux/interrupt.h> |
16 | #include <linux/pci.h> | ||
17 | #include <linux/platform_device.h> | 16 | #include <linux/platform_device.h> |
18 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
19 | #include <media/v4l2-device.h> | 18 | #include <media/v4l2-device.h> |
20 | #include <media/v4l2-ioctl.h> | 19 | #include <media/v4l2-ioctl.h> |
21 | #include <media/v4l2-chip-ident.h> | 20 | #include <media/v4l2-chip-ident.h> |
22 | #include <media/videobuf-dma-sg.h> | 21 | #include <media/videobuf-dma-sg.h> |
23 | #include <linux/device.h> | ||
24 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
25 | #include <linux/dma-mapping.h> | 23 | #include <linux/dma-mapping.h> |
26 | #include <linux/pm_qos_params.h> | 24 | #include <linux/pm_qos_params.h> |
diff --git a/drivers/media/video/zoran/zoran.h b/drivers/media/video/zoran/zoran.h index 27f05551183f..b336259ce20c 100644 --- a/drivers/media/video/zoran/zoran.h +++ b/drivers/media/video/zoran/zoran.h | |||
@@ -95,7 +95,7 @@ struct zoran_params { | |||
95 | 95 | ||
96 | int quality; /* Measure for quality of compressed images. | 96 | int quality; /* Measure for quality of compressed images. |
97 | * Scales linearly with the size of the compressed images. | 97 | * Scales linearly with the size of the compressed images. |
98 | * Must be beetween 0 and 100, 100 is a compression | 98 | * Must be between 0 and 100, 100 is a compression |
99 | * ratio of 1:4 */ | 99 | * ratio of 1:4 */ |
100 | 100 | ||
101 | int odd_even; /* Which field should come first ??? */ | 101 | int odd_even; /* Which field should come first ??? */ |