diff for duplicates of <51FB7AA2.7080305@xs4all.nl> diff --git a/a/1.txt b/N1/1.txt index 76742f2..4e2f0c3 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -41,7 +41,7 @@ On 08/02/2013 03:03 AM, Laurent Pinchart wrote: > + | V4L2_CAP_VIDEO_CAPTURE_MPLANE > + | V4L2_CAP_VIDEO_OUTPUT_MPLANE; > + -> + if (video->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) +> + if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE) > + cap->device_caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE > + | V4L2_CAP_STREAMING; > + else @@ -301,7 +301,7 @@ On 08/02/2013 03:03 AM, Laurent Pinchart wrote: > + int ret = 0; > + > + vfh = kzalloc(sizeof(*vfh), GFP_KERNEL); -> + if (vfh = NULL) +> + if (vfh == NULL) > + return -ENOMEM; > + > + v4l2_fh_init(vfh, &video->video); @@ -324,7 +324,7 @@ On 08/02/2013 03:03 AM, Laurent Pinchart wrote: > + struct v4l2_fh *vfh = file->private_data; > + > + mutex_lock(&video->lock); -> + if (video->queue.owner = vfh) { +> + if (video->queue.owner == vfh) { > + vb2_queue_release(&video->queue); > + video->queue.owner = NULL; > + } @@ -424,8 +424,10 @@ On 08/02/2013 03:03 AM, Laurent Pinchart wrote: > + video->format.width = VSP1_VIDEO_DEF_WIDTH; > + video->format.height = VSP1_VIDEO_DEF_HEIGHT; > + video->format.num_planes = 1; -> + video->format.plane_fmt[0].bytesperline > + video->format.width * video->fmtinfo->bpp[0] / 8; -> + video->format.plane_fmt[0].sizeimage > + video->format.plane_fmt[0].bytesperline * video->format.height; +> + video->format.plane_fmt[0].bytesperline = +> + video->format.width * video->fmtinfo->bpp[0] / 8; +> + video->format.plane_fmt[0].sizeimage = +> + video->format.plane_fmt[0].bytesperline * video->format.height; > + > + /* ... and the video node... */ > + video->video.v4l2_dev = &video->vsp1->v4l2_dev; diff --git a/a/content_digest b/N1/content_digest index 51aaab2..1e91302 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01375405408-17134-8-git-send-email-laurent.pinchart+renesas@ideasonboard.com\0" "From\0Hans Verkuil <hverkuil@xs4all.nl>\0" "Subject\0Re: [PATCH v5 7/9] v4l: Renesas R-Car VSP1 driver\0" - "Date\0Fri, 02 Aug 2013 09:23:46 +0000\0" + "Date\0Fri, 02 Aug 2013 11:23:46 +0200\0" "To\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>\0" "Cc\0linux-media@vger.kernel.org" linux-sh@vger.kernel.org @@ -54,7 +54,7 @@ "> +\t\t\t | V4L2_CAP_VIDEO_CAPTURE_MPLANE\n" "> +\t\t\t | V4L2_CAP_VIDEO_OUTPUT_MPLANE;\n" "> +\n" - "> +\tif (video->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)\n" + "> +\tif (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE)\n" "> +\t\tcap->device_caps = V4L2_CAP_VIDEO_CAPTURE_MPLANE\n" "> +\t\t\t\t | V4L2_CAP_STREAMING;\n" "> +\telse\n" @@ -314,7 +314,7 @@ "> +\tint ret = 0;\n" "> +\n" "> +\tvfh = kzalloc(sizeof(*vfh), GFP_KERNEL);\n" - "> +\tif (vfh = NULL)\n" + "> +\tif (vfh == NULL)\n" "> +\t\treturn -ENOMEM;\n" "> +\n" "> +\tv4l2_fh_init(vfh, &video->video);\n" @@ -337,7 +337,7 @@ "> +\tstruct v4l2_fh *vfh = file->private_data;\n" "> +\n" "> +\tmutex_lock(&video->lock);\n" - "> +\tif (video->queue.owner = vfh) {\n" + "> +\tif (video->queue.owner == vfh) {\n" "> +\t\tvb2_queue_release(&video->queue);\n" "> +\t\tvideo->queue.owner = NULL;\n" "> +\t}\n" @@ -437,8 +437,10 @@ "> +\tvideo->format.width = VSP1_VIDEO_DEF_WIDTH;\n" "> +\tvideo->format.height = VSP1_VIDEO_DEF_HEIGHT;\n" "> +\tvideo->format.num_planes = 1;\n" - "> +\tvideo->format.plane_fmt[0].bytesperline > +\t\tvideo->format.width * video->fmtinfo->bpp[0] / 8;\n" - "> +\tvideo->format.plane_fmt[0].sizeimage > +\t\tvideo->format.plane_fmt[0].bytesperline * video->format.height;\n" + "> +\tvideo->format.plane_fmt[0].bytesperline =\n" + "> +\t\tvideo->format.width * video->fmtinfo->bpp[0] / 8;\n" + "> +\tvideo->format.plane_fmt[0].sizeimage =\n" + "> +\t\tvideo->format.plane_fmt[0].bytesperline * video->format.height;\n" "> +\n" "> +\t/* ... and the video node... */\n" "> +\tvideo->video.v4l2_dev = &video->vsp1->v4l2_dev;\n" @@ -508,4 +510,4 @@ "\n" "\tHans" -d152e5f64e116509c904f83ba782601f55f3d46e63a475e03f27db29f0834cc9 +639b0f732289afd30c233298c88c25015bdfd06dae94fe4c1242bd2f4518641e
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.