aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 13:05:56 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-13 13:05:56 -0500
commit008d23e4852d78bb2618f2035f8b2110b6a6b968 (patch)
tree81c88f744f6f3fc84132527c1ddc0b4da410c5e2 /drivers/media
parent8f685fbda43deccd130d192c9fcef1444649eaca (diff)
parentbfc672dcf323877228682aff79dff8ecd9f30ff8 (diff)
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (43 commits) Documentation/trace/events.txt: Remove obsolete sched_signal_send. writeback: fix global_dirty_limits comment runtime -> real-time ppc: fix comment typo singal -> signal drivers: fix comment typo diable -> disable. m68k: fix comment typo diable -> disable. wireless: comment typo fix diable -> disable. media: comment typo fix diable -> disable. remove doc for obsolete dynamic-printk kernel-parameter remove extraneous 'is' from Documentation/iostats.txt Fix spelling milisec -> ms in snd_ps3 module parameter description Fix spelling mistakes in comments Revert conflicting V4L changes i7core_edac: fix typos in comments mm/rmap.c: fix comment sound, ca0106: Fix assignment to 'channel'. hrtimer: fix a typo in comment init/Kconfig: fix typo anon_inodes: fix wrong function name in comment fix comment typos concerning "consistent" poll: fix a typo in comment ... Fix up trivial conflicts in: - drivers/net/wireless/iwlwifi/iwl-core.c (moved to iwl-legacy.c) - fs/ext4/ext4.h Also fix missed 'diabled' typo in drivers/net/bnx2x/bnx2x.h while at it.
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/video/cx18/cx23418.h2
-rw-r--r--drivers/media/video/cx25840/cx25840-ir.c2
-rw-r--r--drivers/media/video/davinci/vpif.h2
-rw-r--r--drivers/media/video/davinci/vpss.c2
-rw-r--r--drivers/media/video/omap/omap_vout.c2
-rw-r--r--drivers/media/video/saa7164/saa7164-core.c4
-rw-r--r--drivers/media/video/sn9c102/sn9c102_sensor.h2
-rw-r--r--drivers/media/video/tvp7002.c2
-rw-r--r--drivers/media/video/via-camera.c2
9 files changed, 9 insertions, 11 deletions
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
index 2c00980acfcb..7e40035028d2 100644
--- a/drivers/media/video/cx18/cx23418.h
+++ b/drivers/media/video/cx18/cx23418.h
@@ -177,7 +177,7 @@
177 IN[0] - Task handle. 177 IN[0] - Task handle.
178 IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only, 178 IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only,
179 3 = 2D H/V separable, 4 = 2D symmetric non-separable 179 3 = 2D H/V separable, 4 = 2D symmetric non-separable
180 IN[2] - chroma type: 0 - diable, 1 = 1D horizontal 180 IN[2] - chroma type: 0 - disable, 1 = 1D horizontal
181 ReturnCode - One of the ERR_CAPTURE_... */ 181 ReturnCode - One of the ERR_CAPTURE_... */
182#define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C) 182#define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C)
183 183
diff --git a/drivers/media/video/cx25840/cx25840-ir.c b/drivers/media/video/cx25840/cx25840-ir.c
index 627926f6bde8..7eb79af28aa3 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 */
91struct vpss_hw_ops { 91struct vpss_hw_ops {
diff --git a/drivers/media/video/omap/omap_vout.c b/drivers/media/video/omap/omap_vout.c
index 83de97ad971e..029a4babfd61 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 d6bf3f82cc34..58af67f2278b 100644
--- a/drivers/media/video/saa7164/saa7164-core.c
+++ b/drivers/media/video/saa7164/saa7164-core.c
@@ -655,8 +655,8 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id)
655 goto out; 655 goto out;
656 } 656 }
657 657
658 /* Check that the hardware is accessable. If the status bytes are 658 /* Check that the hardware is accessible. If the status bytes are
659 * 0xFF then the device is not accessable, the the IRQ belongs 659 * 0xFF then the device is not accessible, the the IRQ belongs
660 * to another driver. 660 * to another driver.
661 * 4 x u32 interrupt registers. 661 * 4 x u32 interrupt registers.
662 */ 662 */
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
148struct sn9c102_sensor { 148struct 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/tvp7002.c b/drivers/media/video/tvp7002.c
index e63b40f5a706..c799e4eb6fcd 100644
--- a/drivers/media/video/tvp7002.c
+++ b/drivers/media/video/tvp7002.c
@@ -789,7 +789,7 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
789 * Get the value of a TVP7002 decoder device register. 789 * Get the value of a TVP7002 decoder device register.
790 * Returns zero when successful, -EINVAL if register read fails or 790 * Returns zero when successful, -EINVAL if register read fails or
791 * access to I2C client fails, -EPERM if the call is not allowed 791 * access to I2C client fails, -EPERM if the call is not allowed
792 * by diabled CAP_SYS_ADMIN. 792 * by disabled CAP_SYS_ADMIN.
793 */ 793 */
794static int tvp7002_g_register(struct v4l2_subdev *sd, 794static int tvp7002_g_register(struct v4l2_subdev *sd,
795 struct v4l2_dbg_register *reg) 795 struct v4l2_dbg_register *reg)
diff --git a/drivers/media/video/via-camera.c b/drivers/media/video/via-camera.c
index e25aca5759fb..2f973cd56408 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>