diff for duplicates of <2229675.vM0yYbEmYz@avalon> diff --git a/a/1.txt b/N1/1.txt index 48cc7d3..bdb67e9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -94,7 +94,7 @@ On Wednesday 31 July 2013 23:02:05 Sylwester Nawrocki wrote: > > + int ret; > > + > > + lif = devm_kzalloc(vsp1->dev, sizeof(*lif), GFP_KERNEL); -> > + if (lif = NULL) +> > + if (lif == NULL) > > + return ERR_PTR(-ENOMEM); > > + > > + lif->entity.type = VSP1_ENTITY_LIF; @@ -137,10 +137,10 @@ On Wednesday 31 July 2013 23:02:05 Sylwester Nawrocki wrote: > > + pipe->state = VSP1_PIPELINE_STOPPING; > > + spin_unlock_irqrestore(&pipe->irqlock, flags); > > + -> > + ret = wait_event_timeout(pipe->wq, pipe->state = +> > + ret = wait_event_timeout(pipe->wq, pipe->state == > > VSP1_PIPELINE_STOPPED, > > + msecs_to_jiffies(500)); -> > + ret = ret = 0 ? -ETIMEDOUT : 0; +> > + ret = ret == 0 ? -ETIMEDOUT : 0; > > Wouldn't be -ETIME more appropriate ? > @@ -275,7 +275,7 @@ comments is a little different. I'd love to add drivers/media/ to that list ;-) > > + info = vsp1_get_format_info(pix->pixelformat); -> > + if (info = NULL) +> > + if (info == NULL) > > + info = vsp1_get_format_info(VSP1_VIDEO_DEF_FORMAT); > > + > > + pix->pixelformat = info->fourcc; @@ -312,7 +312,7 @@ I'd love to add drivers/media/ to that list ;-) > > + * pix->height / vsub; > > + } > > + -> > + if (info->planes = 3) { +> > + if (info->planes == 3) { > > + /* The second and third planes must have the same stride. */ > > + pix->plane_fmt[2].bytesperline = pix->plane_fmt[1].bytesperline; > > + pix->plane_fmt[2].sizeimage = pix->plane_fmt[1].sizeimage; diff --git a/a/content_digest b/N1/content_digest index 6310572..57a2572 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\051F97B4D.70305@gmail.com\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v4 5/7] v4l: Renesas R-Car VSP1 driver\0" - "Date\0Wed, 31 Jul 2013 22:03:27 +0000\0" + "Date\0Thu, 01 Aug 2013 00:03:27 +0200\0" "To\0Sylwester Nawrocki <sylvester.nawrocki@gmail.com>\0" "Cc\0Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>" linux-media@vger.kernel.org @@ -109,7 +109,7 @@ "> > +\tint ret;\n" "> > +\n" "> > +\tlif = devm_kzalloc(vsp1->dev, sizeof(*lif), GFP_KERNEL);\n" - "> > +\tif (lif = NULL)\n" + "> > +\tif (lif == NULL)\n" "> > +\t\treturn ERR_PTR(-ENOMEM);\n" "> > +\n" "> > +\tlif->entity.type = VSP1_ENTITY_LIF;\n" @@ -152,10 +152,10 @@ "> > +\tpipe->state = VSP1_PIPELINE_STOPPING;\n" "> > +\tspin_unlock_irqrestore(&pipe->irqlock, flags);\n" "> > +\n" - "> > +\tret = wait_event_timeout(pipe->wq, pipe->state = \n" + "> > +\tret = wait_event_timeout(pipe->wq, pipe->state == \n" "> > VSP1_PIPELINE_STOPPED,\n" "> > +\t\t\t\t msecs_to_jiffies(500));\n" - "> > +\tret = ret = 0 ? -ETIMEDOUT : 0;\n" + "> > +\tret = ret == 0 ? -ETIMEDOUT : 0;\n" "> \n" "> Wouldn't be -ETIME more appropriate ?\n" "> \n" @@ -290,7 +290,7 @@ "I'd love to add drivers/media/ to that list ;-)\n" "\n" "> > +\tinfo = vsp1_get_format_info(pix->pixelformat);\n" - "> > +\tif (info = NULL)\n" + "> > +\tif (info == NULL)\n" "> > +\t\tinfo = vsp1_get_format_info(VSP1_VIDEO_DEF_FORMAT);\n" "> > +\n" "> > +\tpix->pixelformat = info->fourcc;\n" @@ -327,7 +327,7 @@ "> > +\t\t\t\t\t * pix->height / vsub;\n" "> > +\t}\n" "> > +\n" - "> > +\tif (info->planes = 3) {\n" + "> > +\tif (info->planes == 3) {\n" "> > +\t\t/* The second and third planes must have the same stride. */\n" "> > +\t\tpix->plane_fmt[2].bytesperline = pix->plane_fmt[1].bytesperline;\n" "> > +\t\tpix->plane_fmt[2].sizeimage = pix->plane_fmt[1].sizeimage;\n" @@ -346,4 +346,4 @@ "\n" Laurent Pinchart -2d3d1c7eb7b5e81a20e98411c07589e116cc3c96110d54a7568e4ac17fdd062e +b9a050e29e9a693d639f5932b6775450fff94fb36c1e74545764f478e0d59ee6
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.