The patch number 8425 was added via Guennadi Liakhovetski <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
v4l: fix checkpatch errors introduced by recent commits
Signed-off-by: Guennadi Liakhovetski <[EMAIL PROTECTED]>
---
linux/drivers/media/video/sh_mobile_ceu_camera.c | 1 +
linux/drivers/media/video/videobuf-dma-contig.c | 8 ++++----
2 files changed, 5 insertions(+), 4 deletions(-)
diff -r 911df1a096a3 -r a5f9ca9b8e91
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Fri Jul 18 01:19:27
2008 -0300
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Thu Jul 17 22:30:47
2008 +0200
@@ -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 -r 911df1a096a3 -r a5f9ca9b8e91
linux/drivers/media/video/videobuf-dma-contig.c
--- a/linux/drivers/media/video/videobuf-dma-contig.c Fri Jul 18 01:19:27
2008 -0300
+++ b/linux/drivers/media/video/videobuf-dma-contig.c Thu Jul 17 22:30:47
2008 +0200
@@ -29,10 +29,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
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/a5f9ca9b8e91c26d17de9fc49a411887a2a0ba80
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits