diff for duplicates of <50AEACA5.1010805@gmail.com> diff --git a/a/1.txt b/N1/1.txt index ccc86de..d3d9e80 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ FWIW, clk_list looks fine for me as well. >>>>>>> + >>>>>>> +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 ad914a8..a3cc679 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\01455556.zPv2GVB7PN@avalon\0" "From\0Sylwester Nawrocki <sylvester.nawrocki@gmail.com>\0" "Subject\0Re: [PATCH v2] media: V4L2: add temporary clock helpers\0" - "Date\0Thu, 22 Nov 2012 22:52:21 +0000\0" + "Date\0Thu, 22 Nov 2012 23:52:21 +0100\0" "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" "Cc\0Sakari Ailus <sakari.ailus@iki.fi>" Guennadi Liakhovetski <g.liakhovetski@gmx.de> @@ -44,7 +44,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" @@ -101,4 +101,4 @@ "Thanks,\n" Sylwester -12dfa9f41f638cb0d1147335b5729ce62ab550dee86684ed47370b151d9c7ea4 +04b90fc5388ecb2ebe519ce05bf2cfe5f60c21c9561e21c013224e5eb0eadb47
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.