From c55a2b768626af032c9495f003e579f6ea2753e3 Mon Sep 17 00:00:00 2001 From: Guennadi Liakhovetski Date: Thu, 17 Jul 2008 17:30:47 -0300 Subject: [PATCH] --- yaml --- r: 106695 b: refs/heads/master c: c60f2b5c1defb6b1345968e1c65c2008c221d57d h: refs/heads/master i: 106693: d00a91deff066ffe51f4e060b9b5625eb9cb2d03 106691: a097388eedbc03f8f96df544111039ffd29585a1 106687: c3af47fccc58c95f7861ef29479032ca5260cee4 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/sh_mobile_ceu_camera.c | 1 + trunk/drivers/media/video/videobuf-dma-contig.c | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 802255199588..7806843fcaba 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82fc52a886aaff8a1605f9d16240e74ddac8570c +refs/heads/master: c60f2b5c1defb6b1345968e1c65c2008c221d57d diff --git a/trunk/drivers/media/video/sh_mobile_ceu_camera.c b/trunk/drivers/media/video/sh_mobile_ceu_camera.c index 012005e1a77b..f7ca3cb9340a 100644 --- a/trunk/drivers/media/video/sh_mobile_ceu_camera.c +++ b/trunk/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/trunk/drivers/media/video/videobuf-dma-contig.c b/trunk/drivers/media/video/videobuf-dma-contig.c index 03f20acb668c..31944b11e6ea 100644 --- a/trunk/drivers/media/video/videobuf-dma-contig.c +++ b/trunk/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