diff for duplicates of <1771793.hErFTLlAOS@avalon> diff --git a/a/1.txt b/N1/1.txt index 7b51430..fe21dd5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -88,7 +88,7 @@ As Sylwester mentioned, what about s/v4l2_clk/v4l2_clks/ ? > + > + if (!id || !clk->id || !strcmp(clk->id, id)) -If id != NULL and clk->id = NULL, the "unnamed" clock will be returned even +If id != NULL and clk->id == NULL, the "unnamed" clock will be returned even though the caller requests a named clock. Isn't that a mistake ? > + return clk; @@ -121,7 +121,7 @@ though the caller requests a named clock. Isn't that a mistake ? > + > +int v4l2_clk_enable(struct v4l2_clk *clk) > +{ -> + if (atomic_inc_return(&clk->enable) = 1 && clk->ops->enable) { +> + if (atomic_inc_return(&clk->enable) == 1 && clk->ops->enable) { > + int ret = clk->ops->enable(clk); > + if (ret < 0) > + atomic_dec(&clk->enable); diff --git a/a/content_digest b/N1/content_digest index 52196e2..2d02516 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0Pine.LNX.4.64.1210301458250.29432@axis700.grange\0" "From\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Subject\0Re: [PATCH v2] media: V4L2: add temporary clock helpers\0" - "Date\0Wed, 31 Oct 2012 09:15:04 +0000\0" + "Date\0Wed, 31 Oct 2012 10:15:04 +0100\0" "To\0Guennadi Liakhovetski <g.liakhovetski@gmx.de>\0" "Cc\0Linux Media Mailing List <linux-media@vger.kernel.org>" Sylwester Nawrocki <sylvester.nawrocki@gmail.com> @@ -101,7 +101,7 @@ "> +\n" "> +\t\tif (!id || !clk->id || !strcmp(clk->id, id))\n" "\n" - "If id != NULL and clk->id = NULL, the \"unnamed\" clock will be returned even \n" + "If id != NULL and clk->id == NULL, the \"unnamed\" clock will be returned even \n" "though the caller requests a named clock. Isn't that a mistake ?\n" "\n" "> +\t\t\treturn clk;\n" @@ -134,7 +134,7 @@ "> +\n" "> +int v4l2_clk_enable(struct v4l2_clk *clk)\n" "> +{\n" - "> +\tif (atomic_inc_return(&clk->enable) = 1 && clk->ops->enable) {\n" + "> +\tif (atomic_inc_return(&clk->enable) == 1 && clk->ops->enable) {\n" "> +\t\tint ret = clk->ops->enable(clk);\n" "> +\t\tif (ret < 0)\n" "> +\t\t\tatomic_dec(&clk->enable);\n" @@ -349,4 +349,4 @@ "\n" Laurent Pinchart -92de9d11c3951e034e08a83fcbfe50a8126af684b84ded0cf9d7ca974caf4ef2 +8f735e106ab984d2be02a463c029eb9c948328fb5a4d0e68a47091682195744b
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.