diff for duplicates of <561BAA12.9060502@mentor.com> diff --git a/a/1.txt b/N1/1.txt index b041121..c1531c4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -9,20 +9,20 @@ On 05.10.2015 16:30, Boris Brezillon wrote: >>> Thierry Reding <thierry.reding@gmail.com> wrote: >>> >>>> On Thu, Oct 01, 2015 at 10:00:22AM +0200, Nicolas Ferre wrote: ->>>>> Le 30/09/2015 21:29, Robert Jarzmik a écrit : +>>>>> Le 30/09/2015 21:29, Robert Jarzmik a écrit : >>>>>> Robert Jarzmik <robert.jarzmik@free.fr> writes: >>>>>> >>>>>>> This reverts commit 68feaca0b13e453aa14ee064c1736202b48b342f. >>>>>>> This commit breaks legacy platforms, for which : >>>>>>> (a) no pwm table is added (legacy platforms) >>>>>>> (b) in this case, in pwm_get(), pmw_lookup_list is empty, and therefore ->>>>>>> chosen = NULL, and therefore pwm_get() returns NULL, and pwm_get() +>>>>>>> chosen == NULL, and therefore pwm_get() returns NULL, and pwm_get() >>>>>>> returns -EPROBE_DEFER >>>>>>> (c) as a consequence, this code is unreachable in pwm_bl.c : >>>>>>> if (IS_ERR(pb->pwm)) { >>>>>>> ret = PTR_ERR(pb->pwm); >>>>>>> dev_info(&pdev->dev, "%s:%d(): %d\n", __func__, __LINE__, ret); ->>>>>>> if (ret = -EPROBE_DEFER) +>>>>>>> if (ret == -EPROBE_DEFER) >>>>>>> goto err_alloc; >>>>>>> >>>>>>> dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -51,7 +51,7 @@ On 05.10.2015 16:30, Boris Brezillon wrote: >>>>> pb->pwm = devm_pwm_get(&pdev->dev, NULL); >>>>> if (IS_ERR(pb->pwm)) { >>>>> ret = PTR_ERR(pb->pwm); ->>>>> - if (ret = -EPROBE_DEFER) +>>>>> - if (ret == -EPROBE_DEFER) >>>>> - goto err_alloc; >>>>> >>>>> dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -74,7 +74,7 @@ On 05.10.2015 16:30, Boris Brezillon wrote: >>>> you want to be nit-picking), but it is subtly buggy. If you have a >>>> system with multiple PWM providers, you could end up failing the first >>>> pwm_get() with -EPROBE_DEFER but then continue to the legacy case, and ->>>> this could succeed because data->pwm_id = 0, and that other provider +>>>> this could succeed because data->pwm_id == 0, and that other provider >>>> could be exporting the PWM with this ID. If I remember correctly this >>>> was one of the reasons why the offending commit was merged in the first >>>> place. diff --git a/a/content_digest b/N1/content_digest index 626dcb4..78dd1c8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -7,7 +7,7 @@ "ref\020151005153024.3a245b0b@bbrezillon\0" "From\0Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>\0" "Subject\0Re: [PATCH] Revert \"backlight: pwm: Handle EPROBE_DEFER while requesting the PWM\"\0" - "Date\0Mon, 12 Oct 2015 12:39:46 +0000\0" + "Date\0Mon, 12 Oct 2015 15:39:46 +0300\0" "To\0Boris Brezillon <boris.brezillon@free-electrons.com>" " Thierry Reding <thierry.reding@gmail.com>\0" "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" @@ -33,20 +33,20 @@ ">>> Thierry Reding <thierry.reding@gmail.com> wrote:\n" ">>>\n" ">>>> On Thu, Oct 01, 2015 at 10:00:22AM +0200, Nicolas Ferre wrote:\n" - ">>>>> Le 30/09/2015 21:29, Robert Jarzmik a \303\203\302\251crit :\n" + ">>>>> Le 30/09/2015 21:29, Robert Jarzmik a \303\251crit :\n" ">>>>>> Robert Jarzmik <robert.jarzmik@free.fr> writes:\n" ">>>>>>\n" ">>>>>>> This reverts commit 68feaca0b13e453aa14ee064c1736202b48b342f.\n" ">>>>>>> This commit breaks legacy platforms, for which :\n" ">>>>>>> (a) no pwm table is added (legacy platforms)\n" ">>>>>>> (b) in this case, in pwm_get(), pmw_lookup_list is empty, and therefore\n" - ">>>>>>> chosen = NULL, and therefore pwm_get() returns NULL, and pwm_get()\n" + ">>>>>>> chosen == NULL, and therefore pwm_get() returns NULL, and pwm_get()\n" ">>>>>>> returns -EPROBE_DEFER\n" ">>>>>>> (c) as a consequence, this code is unreachable in pwm_bl.c :\n" ">>>>>>> if (IS_ERR(pb->pwm)) {\n" ">>>>>>> \tret = PTR_ERR(pb->pwm);\n" ">>>>>>> \tdev_info(&pdev->dev, \"%s:%d(): %d\\n\", __func__, __LINE__, ret);\n" - ">>>>>>> \tif (ret = -EPROBE_DEFER)\n" + ">>>>>>> \tif (ret == -EPROBE_DEFER)\n" ">>>>>>> \t\tgoto err_alloc;\n" ">>>>>>>\n" ">>>>>>> \tdev_err(&pdev->dev, \"unable to request PWM, trying legacy API\\n\");\n" @@ -75,7 +75,7 @@ ">>>>> \tpb->pwm = devm_pwm_get(&pdev->dev, NULL);\n" ">>>>> \tif (IS_ERR(pb->pwm)) {\n" ">>>>> \t\tret = PTR_ERR(pb->pwm);\n" - ">>>>> -\t\tif (ret = -EPROBE_DEFER)\n" + ">>>>> -\t\tif (ret == -EPROBE_DEFER)\n" ">>>>> -\t\t\tgoto err_alloc;\n" ">>>>> \n" ">>>>> \t\tdev_err(&pdev->dev, \"unable to request PWM, trying legacy API\\n\");\n" @@ -98,7 +98,7 @@ ">>>> you want to be nit-picking), but it is subtly buggy. If you have a\n" ">>>> system with multiple PWM providers, you could end up failing the first\n" ">>>> pwm_get() with -EPROBE_DEFER but then continue to the legacy case, and\n" - ">>>> this could succeed because data->pwm_id = 0, and that other provider\n" + ">>>> this could succeed because data->pwm_id == 0, and that other provider\n" ">>>> could be exporting the PWM with this ID. If I remember correctly this\n" ">>>> was one of the reasons why the offending commit was merged in the first\n" ">>>> place.\n" @@ -143,4 +143,4 @@ "With best wishes,\n" Vladimir -7bf325e29c3088ba6756bc256dec8221cddec70f528af1c92116cb2589220f1e +8f7ba922b445849ccef7e29f40f6379f56ff0f0ed3f174a24cf0b66dad651009
diff --git a/a/1.txt b/N2/1.txt index b041121..c1531c4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -9,20 +9,20 @@ On 05.10.2015 16:30, Boris Brezillon wrote: >>> Thierry Reding <thierry.reding@gmail.com> wrote: >>> >>>> On Thu, Oct 01, 2015 at 10:00:22AM +0200, Nicolas Ferre wrote: ->>>>> Le 30/09/2015 21:29, Robert Jarzmik a écrit : +>>>>> Le 30/09/2015 21:29, Robert Jarzmik a écrit : >>>>>> Robert Jarzmik <robert.jarzmik@free.fr> writes: >>>>>> >>>>>>> This reverts commit 68feaca0b13e453aa14ee064c1736202b48b342f. >>>>>>> This commit breaks legacy platforms, for which : >>>>>>> (a) no pwm table is added (legacy platforms) >>>>>>> (b) in this case, in pwm_get(), pmw_lookup_list is empty, and therefore ->>>>>>> chosen = NULL, and therefore pwm_get() returns NULL, and pwm_get() +>>>>>>> chosen == NULL, and therefore pwm_get() returns NULL, and pwm_get() >>>>>>> returns -EPROBE_DEFER >>>>>>> (c) as a consequence, this code is unreachable in pwm_bl.c : >>>>>>> if (IS_ERR(pb->pwm)) { >>>>>>> ret = PTR_ERR(pb->pwm); >>>>>>> dev_info(&pdev->dev, "%s:%d(): %d\n", __func__, __LINE__, ret); ->>>>>>> if (ret = -EPROBE_DEFER) +>>>>>>> if (ret == -EPROBE_DEFER) >>>>>>> goto err_alloc; >>>>>>> >>>>>>> dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -51,7 +51,7 @@ On 05.10.2015 16:30, Boris Brezillon wrote: >>>>> pb->pwm = devm_pwm_get(&pdev->dev, NULL); >>>>> if (IS_ERR(pb->pwm)) { >>>>> ret = PTR_ERR(pb->pwm); ->>>>> - if (ret = -EPROBE_DEFER) +>>>>> - if (ret == -EPROBE_DEFER) >>>>> - goto err_alloc; >>>>> >>>>> dev_err(&pdev->dev, "unable to request PWM, trying legacy API\n"); @@ -74,7 +74,7 @@ On 05.10.2015 16:30, Boris Brezillon wrote: >>>> you want to be nit-picking), but it is subtly buggy. If you have a >>>> system with multiple PWM providers, you could end up failing the first >>>> pwm_get() with -EPROBE_DEFER but then continue to the legacy case, and ->>>> this could succeed because data->pwm_id = 0, and that other provider +>>>> this could succeed because data->pwm_id == 0, and that other provider >>>> could be exporting the PWM with this ID. If I remember correctly this >>>> was one of the reasons why the offending commit was merged in the first >>>> place. diff --git a/a/content_digest b/N2/content_digest index 626dcb4..f5198ae 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -7,19 +7,19 @@ "ref\020151005153024.3a245b0b@bbrezillon\0" "From\0Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>\0" "Subject\0Re: [PATCH] Revert \"backlight: pwm: Handle EPROBE_DEFER while requesting the PWM\"\0" - "Date\0Mon, 12 Oct 2015 12:39:46 +0000\0" + "Date\0Mon, 12 Oct 2015 15:39:46 +0300\0" "To\0Boris Brezillon <boris.brezillon@free-electrons.com>" " Thierry Reding <thierry.reding@gmail.com>\0" "Cc\0Nicolas Ferre <nicolas.ferre@atmel.com>" Robert Jarzmik <robert.jarzmik@free.fr> - linux-pwm@vger.kernel.org + <linux-pwm@vger.kernel.org> Alexandre Belloni <alexandre.belloni@free-electrons.com> Jingoo Han <jingoohan1@gmail.com> Lee Jones <lee.jones@linaro.org> Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> Tomi Valkeinen <tomi.valkeinen@ti.com> - linux-fbdev@vger.kernel.org - " linux-kernel@vger.kernel.org\0" + <linux-fbdev@vger.kernel.org> + " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" "On 05.10.2015 16:30, Boris Brezillon wrote:\n" @@ -33,20 +33,20 @@ ">>> Thierry Reding <thierry.reding@gmail.com> wrote:\n" ">>>\n" ">>>> On Thu, Oct 01, 2015 at 10:00:22AM +0200, Nicolas Ferre wrote:\n" - ">>>>> Le 30/09/2015 21:29, Robert Jarzmik a \303\203\302\251crit :\n" + ">>>>> Le 30/09/2015 21:29, Robert Jarzmik a \303\251crit :\n" ">>>>>> Robert Jarzmik <robert.jarzmik@free.fr> writes:\n" ">>>>>>\n" ">>>>>>> This reverts commit 68feaca0b13e453aa14ee064c1736202b48b342f.\n" ">>>>>>> This commit breaks legacy platforms, for which :\n" ">>>>>>> (a) no pwm table is added (legacy platforms)\n" ">>>>>>> (b) in this case, in pwm_get(), pmw_lookup_list is empty, and therefore\n" - ">>>>>>> chosen = NULL, and therefore pwm_get() returns NULL, and pwm_get()\n" + ">>>>>>> chosen == NULL, and therefore pwm_get() returns NULL, and pwm_get()\n" ">>>>>>> returns -EPROBE_DEFER\n" ">>>>>>> (c) as a consequence, this code is unreachable in pwm_bl.c :\n" ">>>>>>> if (IS_ERR(pb->pwm)) {\n" ">>>>>>> \tret = PTR_ERR(pb->pwm);\n" ">>>>>>> \tdev_info(&pdev->dev, \"%s:%d(): %d\\n\", __func__, __LINE__, ret);\n" - ">>>>>>> \tif (ret = -EPROBE_DEFER)\n" + ">>>>>>> \tif (ret == -EPROBE_DEFER)\n" ">>>>>>> \t\tgoto err_alloc;\n" ">>>>>>>\n" ">>>>>>> \tdev_err(&pdev->dev, \"unable to request PWM, trying legacy API\\n\");\n" @@ -75,7 +75,7 @@ ">>>>> \tpb->pwm = devm_pwm_get(&pdev->dev, NULL);\n" ">>>>> \tif (IS_ERR(pb->pwm)) {\n" ">>>>> \t\tret = PTR_ERR(pb->pwm);\n" - ">>>>> -\t\tif (ret = -EPROBE_DEFER)\n" + ">>>>> -\t\tif (ret == -EPROBE_DEFER)\n" ">>>>> -\t\t\tgoto err_alloc;\n" ">>>>> \n" ">>>>> \t\tdev_err(&pdev->dev, \"unable to request PWM, trying legacy API\\n\");\n" @@ -98,7 +98,7 @@ ">>>> you want to be nit-picking), but it is subtly buggy. If you have a\n" ">>>> system with multiple PWM providers, you could end up failing the first\n" ">>>> pwm_get() with -EPROBE_DEFER but then continue to the legacy case, and\n" - ">>>> this could succeed because data->pwm_id = 0, and that other provider\n" + ">>>> this could succeed because data->pwm_id == 0, and that other provider\n" ">>>> could be exporting the PWM with this ID. If I remember correctly this\n" ">>>> was one of the reasons why the offending commit was merged in the first\n" ">>>> place.\n" @@ -143,4 +143,4 @@ "With best wishes,\n" Vladimir -7bf325e29c3088ba6756bc256dec8221cddec70f528af1c92116cb2589220f1e +e783db015bb98ef1b33fdf631dc9e8d913f3ec6cafa6723a0231b9f8c2766a24
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.