diff for duplicates of <52704B80.2040507@gmail.com> diff --git a/a/1.txt b/N1/1.txt index b3e2e11..15e243b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -52,7 +52,7 @@ tree, if Mike is willing to take it and we get yours and Mauro's Ack on it. >> - struct clk *clk; >> >> xclk->isp = isp; ->> xclk->id = i == 0 ? ISP_XCLK_A : ISP_XCLK_B; +>> xclk->id = i = 0 ? ISP_XCLK_A : ISP_XCLK_B; >> @@ -305,10 +307,15 @@ static int isp_xclk_init(struct isp_device *isp) >> init.num_parents = 1; >> @@ -71,8 +71,8 @@ tree, if Mike is willing to take it and we get yours and Mauro's Ack on it. >> + if (IS_ERR(xclk->clk)) >> + return PTR_ERR(xclk->clk); >> ->> if (pdata->xclks[i].con_id == NULL&& ->> pdata->xclks[i].dev_id == NULL) +>> if (pdata->xclks[i].con_id = NULL&& +>> pdata->xclks[i].dev_id = NULL) >> @@ -320,7 +327,7 @@ static int isp_xclk_init(struct isp_device *isp) >> >> xclk->lookup->con_id = pdata->xclks[i].con_id; diff --git a/a/content_digest b/N1/content_digest index a24a90e..550abe6 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,20 +3,8 @@ "ref\016467881.81yEf9zq68@avalon\0" "From\0Sylwester Nawrocki <sylvester.nawrocki@gmail.com>\0" "Subject\0Re: [PATCH v7 1/5] omap3isp: Modify clocks registration to avoid circular references\0" - "Date\0Wed, 30 Oct 2013 00:57:52 +0100\0" - "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Cc\0Sylwester Nawrocki <s.nawrocki@samsung.com>" - linux-arm-kernel@lists.infradead.org - mturquette@linaro.org - linux@arm.linux.org.uk - jiada_wang@mentor.com - kyungmin.park@samsung.com - linux-kernel@vger.kernel.org - uclinux-dist-devel@blackfin.uclinux.org - linux-mips@linux-mips.org - linux-sh@vger.kernel.org - LMML <linux-media@vger.kernel.org> - " Mauro Carvalho Chehab <m.chehab@samsung.com>\0" + "Date\0Tue, 29 Oct 2013 23:57:52 +0000\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Laurent,\n" @@ -73,7 +61,7 @@ ">> -\t\tstruct clk *clk;\n" ">>\n" ">> \t\txclk->isp = isp;\n" - ">> \t\txclk->id = i == 0 ? ISP_XCLK_A : ISP_XCLK_B;\n" + ">> \t\txclk->id = i = 0 ? ISP_XCLK_A : ISP_XCLK_B;\n" ">> @@ -305,10 +307,15 @@ static int isp_xclk_init(struct isp_device *isp)\n" ">> \t\tinit.num_parents = 1;\n" ">>\n" @@ -92,8 +80,8 @@ ">> +\t\tif (IS_ERR(xclk->clk))\n" ">> +\t\t\treturn PTR_ERR(xclk->clk);\n" ">>\n" - ">> \t\tif (pdata->xclks[i].con_id == NULL&&\n" - ">> \t\tpdata->xclks[i].dev_id == NULL)\n" + ">> \t\tif (pdata->xclks[i].con_id = NULL&&\n" + ">> \t\tpdata->xclks[i].dev_id = NULL)\n" ">> @@ -320,7 +327,7 @@ static int isp_xclk_init(struct isp_device *isp)\n" ">>\n" ">> \t\txclk->lookup->con_id = pdata->xclks[i].con_id;\n" @@ -130,4 +118,4 @@ "Regards,\n" Sylwester -698bc7fad83c30712e6d9a9cdad3425adc298eb23067c5012ba63a4dabfc1896 +deebfea7bec06699ca5af2f41d55ae9f2a2504ebfee69842a4dbb597fd6db2de
diff --git a/a/content_digest b/N2/content_digest index a24a90e..cbc6cbb 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,10 @@ "ref\01383076268-8984-1-git-send-email-s.nawrocki@samsung.com\0" "ref\01383076268-8984-2-git-send-email-s.nawrocki@samsung.com\0" "ref\016467881.81yEf9zq68@avalon\0" - "From\0Sylwester Nawrocki <sylvester.nawrocki@gmail.com>\0" - "Subject\0Re: [PATCH v7 1/5] omap3isp: Modify clocks registration to avoid circular references\0" + "From\0sylvester.nawrocki@gmail.com (Sylwester Nawrocki)\0" + "Subject\0[PATCH v7 1/5] omap3isp: Modify clocks registration to avoid circular references\0" "Date\0Wed, 30 Oct 2013 00:57:52 +0100\0" - "To\0Laurent Pinchart <laurent.pinchart@ideasonboard.com>\0" - "Cc\0Sylwester Nawrocki <s.nawrocki@samsung.com>" - linux-arm-kernel@lists.infradead.org - mturquette@linaro.org - linux@arm.linux.org.uk - jiada_wang@mentor.com - kyungmin.park@samsung.com - linux-kernel@vger.kernel.org - uclinux-dist-devel@blackfin.uclinux.org - linux-mips@linux-mips.org - linux-sh@vger.kernel.org - LMML <linux-media@vger.kernel.org> - " Mauro Carvalho Chehab <m.chehab@samsung.com>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi Laurent,\n" @@ -130,4 +118,4 @@ "Regards,\n" Sylwester -698bc7fad83c30712e6d9a9cdad3425adc298eb23067c5012ba63a4dabfc1896 +c27260be84cadbb0221beb9a3cb8e4a062d125f97432e30c4d251eb396836aa8
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.