V4L/DVB (8425): v4l: fix checkpatch errors introduced by recent commits
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Thu, 17 Jul 2008 20:30:47 +0000 (17:30 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 23 Jul 2008 11:09:21 +0000 (08:09 -0300)
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/sh_mobile_ceu_camera.c
drivers/media/video/videobuf-dma-contig.c

index 012005e1a77b60e771e54ed329d315d2a0a8b132..f7ca3cb9340ad3ef0fb750dcd60a229f9d0c2208 100644 (file)
@@ -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;
index 03f20acb668cfd193a5ef8fea7a0315fe0083c88..31944b11e6ea409fa454eb1f02a99f7e761f2e4e 100644 (file)
@@ -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