The patch number 8426 was added via Mauro Carvalho Chehab <[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]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab <[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 dbf11a308e97 -r 57fdbaeec956
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Sun Jul 20 08:31:29
2008 -0300
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Sun Jul 20 08:33:59
2008 -0300
@@ -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 dbf11a308e97 -r 57fdbaeec956
linux/drivers/media/video/videobuf-dma-contig.c
--- a/linux/drivers/media/video/videobuf-dma-contig.c Sun Jul 20 08:31:29
2008 -0300
+++ b/linux/drivers/media/video/videobuf-dma-contig.c Sun Jul 20 08:33:59
2008 -0300
@@ -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/57fdbaeec956cedb940fbd785e324969225507f1
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
