diff options
| author |   Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2008-07-17 17:30:47 -0300 |
|---|---|---|
| committer |   Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 08:09:21 -0300 |
| commit | c60f2b5c1defb6b1345968e1c65c2008c221d57d (patch) | |
| tree | 70042d394754304be7040f405b333ebdfeb8f945 | |
| parent | V4L/DVB (8423): cx18: remove firmware size check (diff) | |
| download | linux-dev-c60f2b5c1defb6b1345968e1c65c2008c221d57d.tar.xz linux-dev-c60f2b5c1defb6b1345968e1c65c2008c221d57d.zip | |
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>
| -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 { void __iomem *base; unsigned long video_limit; + /* lock used to protect videobuf */ spinlock_t lock; struct list_head capture; 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 { }; #define MAGIC_DC_MEM 0x0733ac61 -#define MAGIC_CHECK(is, should) \ - if (unlikely((is) != (should))) { \ - pr_err("magic mismatch: %x expected %x\n", is, should); \ - BUG(); \ +#define MAGIC_CHECK(is, should) \ + if (unlikely((is) != (should))) { \ + pr_err("magic mismatch: %x expected %x\n", (is), (should)); \ + BUG(); \ } static void |