diff options
author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2008-07-17 16:30:47 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 07:09:21 -0400 |
commit | c60f2b5c1defb6b1345968e1c65c2008c221d57d (patch) | |
tree | 70042d394754304be7040f405b333ebdfeb8f945 /drivers/media/video | |
parent | 82fc52a886aaff8a1605f9d16240e74ddac8570c (diff) |
V4L/DVB (8425): v4l: fix checkpatch errors introduced by recent commits
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/sh_mobile_ceu_camera.c | 1 | ||||
-rw-r--r-- | drivers/media/video/videobuf-dma-contig.c | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/media/video/sh_mobile_ceu_camera.c b/drivers/media/video/sh_mobile_ceu_camera.c index 012005e1a77b..f7ca3cb9340a 100644 --- a/drivers/media/video/sh_mobile_ceu_camera.c +++ b/drivers/media/video/sh_mobile_ceu_camera.c | |||
@@ -91,6 +91,7 @@ struct sh_mobile_ceu_dev { | |||
91 | void __iomem *base; | 91 | void __iomem *base; |
92 | unsigned long video_limit; | 92 | unsigned long video_limit; |
93 | 93 | ||
94 | /* lock used to protect videobuf */ | ||
94 | spinlock_t lock; | 95 | spinlock_t lock; |
95 | struct list_head capture; | 96 | struct list_head capture; |
96 | struct videobuf_buffer *active; | 97 | struct videobuf_buffer *active; |
diff --git a/drivers/media/video/videobuf-dma-contig.c b/drivers/media/video/videobuf-dma-contig.c index 03f20acb668c..31944b11e6ea 100644 --- a/drivers/media/video/videobuf-dma-contig.c +++ b/drivers/media/video/videobuf-dma-contig.c | |||
@@ -28,10 +28,10 @@ struct videobuf_dma_contig_memory { | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | #define MAGIC_DC_MEM 0x0733ac61 | 30 | #define MAGIC_DC_MEM 0x0733ac61 |
31 | #define MAGIC_CHECK(is, should) \ | 31 | #define MAGIC_CHECK(is, should) \ |
32 | if (unlikely((is) != (should))) { \ | 32 | if (unlikely((is) != (should))) { \ |
33 | pr_err("magic mismatch: %x expected %x\n", is, should); \ | 33 | pr_err("magic mismatch: %x expected %x\n", (is), (should)); \ |
34 | BUG(); \ | 34 | BUG(); \ |
35 | } | 35 | } |
36 | 36 | ||
37 | static void | 37 | static void |