diff for duplicates of <20080714120240.4806.15664.sendpatchset@rx1.opensource.se> diff --git a/a/1.txt b/N1/1.txt index 363b537..9f36a88 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -113,7 +113,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); @@ -124,7 +124,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) @@ -286,10 +286,10 @@ Signed-off-by: Magnus Damm <damm@igel.co.jp> + + 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", + offset); + return -EINVAL; @@ -403,7 +403,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; @@ -509,3 +509,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 5965966..fc0ed91 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020080714120204.4806.87287.sendpatchset@rx1.opensource.se\0" "From\0Magnus Damm <magnus.damm@gmail.com>\0" "Subject\0[PATCH 04/06] videobuf: Add physically contiguous queue code V3\0" - "Date\0Mon, 14 Jul 2008 12:02:40 +0000\0" + "Date\0Mon, 14 Jul 2008 21:02:40 +0900\0" "To\0video4linux-list@redhat.com\0" "Cc\0paulius.zaleckas@teltonika.lt" linux-sh@vger.kernel.org @@ -126,7 +126,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" @@ -137,7 +137,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" @@ -299,10 +299,10 @@ "+\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\toffset);\n" "+\t\treturn -EINVAL;\n" @@ -416,7 +416,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" @@ -521,6 +521,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 -9b901453f3ab01967731ac7273c419382f1f8e123774e70d352b061246367b10 +7747dc48a04be371d59d790946a972fdd749fdc8f74a174cad27cb62b1a4f5a8
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.