diff for duplicates of <20080701124735.30446.89320.sendpatchset@rx1.opensource.se>

diff --git a/a/1.txt b/N1/1.txt
index 1c6f241..0a54502 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -93,7 +93,7 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
 +		map, map->count, vma->vm_start, vma->vm_end);
 +
 +	map->count--;
-+	if (0 = map->count) {
++	if (0 == map->count) {
 +		struct videobuf_dma_contig_memory *mem;
 +
 +		dev_dbg(map->q->dev, "munmap %p q=%p\n", map, q);
@@ -104,7 +104,7 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
 +			videobuf_queue_cancel(q);
 +
 +		for (i = 0; i < VIDEO_MAX_FRAME; i++) {
-+			if (NULL = q->bufs[i])
++			if (NULL == q->bufs[i])
 +				continue;
 +
 +			if (q->bufs[i]->map != map)
@@ -259,15 +259,15 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
 +
 +	/* look for first buffer to map */
 +	for (first = 0; first < VIDEO_MAX_FRAME; first++) {
-+		if (NULL = q->bufs[first])
++		if (NULL == q->bufs[first])
 +			continue;
 +
 +		if (V4L2_MEMORY_MMAP != q->bufs[first]->memory)
 +			continue;
-+		if (q->bufs[first]->boff = offset)
++		if (q->bufs[first]->boff == offset)
 +			break;
 +	}
-+	if (VIDEO_MAX_FRAME = first) {
++	if (VIDEO_MAX_FRAME == first) {
 +		dev_dbg(q->dev, "invalid user space offset [offset=0x%lx]\n",
 +			(vma->vm_pgoff << PAGE_SHIFT));
 +		return -EINVAL;
@@ -275,7 +275,7 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
 +
 +	/* create mapping + update buffer list */
 +	map = kzalloc(sizeof(struct videobuf_mapping), GFP_KERNEL);
-+	if (NULL = map)
++	if (NULL == map)
 +		return -ENOMEM;
 +
 +	q->bufs[first]->map = map;
@@ -380,7 +380,7 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
 +	/* copy stuff using the common method */
 +	count = __videobuf_copy_to_user(q, data, count, nonblocking);
 +
-+	if ((count = -EFAULT) && (pos = 0))
++	if ((count == -EFAULT) && (pos == 0))
 +		return -EFAULT;
 +
 +	return count;
@@ -437,7 +437,7 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
 +	   So, it should free memory only if the memory were allocated for
 +	   read() operation.
 +	 */
-+	if ((buf->memory != V4L2_MEMORY_USERPTR) || (buf->baddr = 0))
++	if ((buf->memory != V4L2_MEMORY_USERPTR) || (buf->baddr == 0))
 +		return;
 +
 +	if (!mem)
@@ -499,3 +499,8 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp>
 +			      struct videobuf_buffer *buf);
 +
 +#endif /* _VIDEOBUF_DMA_CONTIG_H */
+
+--
+video4linux-list mailing list
+Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe
+https://www.redhat.com/mailman/listinfo/video4linux-list
diff --git a/a/content_digest b/N1/content_digest
index 50d164e..4740db9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -1,7 +1,7 @@
  "ref\020080701124638.30446.81449.sendpatchset@rx1.opensource.se\0"
  "From\0Magnus Damm <magnus.damm@gmail.com>\0"
  "Subject\0[PATCH 06/07] videobuf: Add physically contiguous queue code\0"
- "Date\0Tue, 01 Jul 2008 12:47:35 +0000\0"
+ "Date\0Tue, 01 Jul 2008 21:47:35 +0900\0"
  "To\0video4linux-list@redhat.com\0"
  "Cc\0akpm@linux-foundation.org"
   lethal@linux-sh.org
@@ -104,7 +104,7 @@
  "+\t\tmap, map->count, vma->vm_start, vma->vm_end);\n"
  "+\n"
  "+\tmap->count--;\n"
- "+\tif (0 = map->count) {\n"
+ "+\tif (0 == map->count) {\n"
  "+\t\tstruct videobuf_dma_contig_memory *mem;\n"
  "+\n"
  "+\t\tdev_dbg(map->q->dev, \"munmap %p q=%p\\n\", map, q);\n"
@@ -115,7 +115,7 @@
  "+\t\t\tvideobuf_queue_cancel(q);\n"
  "+\n"
  "+\t\tfor (i = 0; i < VIDEO_MAX_FRAME; i++) {\n"
- "+\t\t\tif (NULL = q->bufs[i])\n"
+ "+\t\t\tif (NULL == q->bufs[i])\n"
  "+\t\t\t\tcontinue;\n"
  "+\n"
  "+\t\t\tif (q->bufs[i]->map != map)\n"
@@ -270,15 +270,15 @@
  "+\n"
  "+\t/* look for first buffer to map */\n"
  "+\tfor (first = 0; first < VIDEO_MAX_FRAME; first++) {\n"
- "+\t\tif (NULL = q->bufs[first])\n"
+ "+\t\tif (NULL == q->bufs[first])\n"
  "+\t\t\tcontinue;\n"
  "+\n"
  "+\t\tif (V4L2_MEMORY_MMAP != q->bufs[first]->memory)\n"
  "+\t\t\tcontinue;\n"
- "+\t\tif (q->bufs[first]->boff = offset)\n"
+ "+\t\tif (q->bufs[first]->boff == offset)\n"
  "+\t\t\tbreak;\n"
  "+\t}\n"
- "+\tif (VIDEO_MAX_FRAME = first) {\n"
+ "+\tif (VIDEO_MAX_FRAME == first) {\n"
  "+\t\tdev_dbg(q->dev, \"invalid user space offset [offset=0x%lx]\\n\",\n"
  "+\t\t\t(vma->vm_pgoff << PAGE_SHIFT));\n"
  "+\t\treturn -EINVAL;\n"
@@ -286,7 +286,7 @@
  "+\n"
  "+\t/* create mapping + update buffer list */\n"
  "+\tmap = kzalloc(sizeof(struct videobuf_mapping), GFP_KERNEL);\n"
- "+\tif (NULL = map)\n"
+ "+\tif (NULL == map)\n"
  "+\t\treturn -ENOMEM;\n"
  "+\n"
  "+\tq->bufs[first]->map = map;\n"
@@ -391,7 +391,7 @@
  "+\t/* copy stuff using the common method */\n"
  "+\tcount = __videobuf_copy_to_user(q, data, count, nonblocking);\n"
  "+\n"
- "+\tif ((count = -EFAULT) && (pos = 0))\n"
+ "+\tif ((count == -EFAULT) && (pos == 0))\n"
  "+\t\treturn -EFAULT;\n"
  "+\n"
  "+\treturn count;\n"
@@ -448,7 +448,7 @@
  "+\t   So, it should free memory only if the memory were allocated for\n"
  "+\t   read() operation.\n"
  "+\t */\n"
- "+\tif ((buf->memory != V4L2_MEMORY_USERPTR) || (buf->baddr = 0))\n"
+ "+\tif ((buf->memory != V4L2_MEMORY_USERPTR) || (buf->baddr == 0))\n"
  "+\t\treturn;\n"
  "+\n"
  "+\tif (!mem)\n"
@@ -509,6 +509,11 @@
  "+void videobuf_dma_contig_free(struct videobuf_queue *q,\n"
  "+\t\t\t      struct videobuf_buffer *buf);\n"
  "+\n"
- +#endif /* _VIDEOBUF_DMA_CONTIG_H */
+ "+#endif /* _VIDEOBUF_DMA_CONTIG_H */\n"
+ "\n"
+ "--\n"
+ "video4linux-list mailing list\n"
+ "Unsubscribe mailto:video4linux-list-request@redhat.com?subject=unsubscribe\n"
+ https://www.redhat.com/mailman/listinfo/video4linux-list
 
-b98ba9b44268db981a398b788c6b0299ac62109b90be7e06f6ed563a11a348fa
+5a8cf6f04cd8e244b2657582f7cef09d0a728b62e91bde5e37f8c2c16ce243d8
