diff for duplicates of <55B9F4F1.2060901@atmel.com> diff --git a/a/1.txt b/N1/1.txt index 3cb7e48..cb5db43 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,8 +1,8 @@ -Le 30/07/2015 02:24, Alexandre Belloni a =C3=A9crit : +Le 30/07/2015 02:24, Alexandre Belloni a ?crit : > In case of a probe error, it is possible to abort after issuing > clk_prepare_enable(). Ensure the clock is disabled and unprepared in that > case. ->=20 +> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> To the whole series: @@ -13,39 +13,36 @@ Thanks. > --- > drivers/rtc/rtc-at91sam9.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) ->=20 +> > diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c > index 5ccaee32df72..152cd816cc43 100644 > --- a/drivers/rtc/rtc-at91sam9.c > +++ b/drivers/rtc/rtc-at91sam9.c -> @@ -451,8 +451,10 @@ static int at91_rtc_probe(struct platform_device *pd= -ev) -> =20 -> rtc->rtcdev =3D devm_rtc_device_register(&pdev->dev, pdev->name, +> @@ -451,8 +451,10 @@ static int at91_rtc_probe(struct platform_device *pdev) +> +> rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name, > &at91_rtc_ops, THIS_MODULE); > - if (IS_ERR(rtc->rtcdev)) > - return PTR_ERR(rtc->rtcdev); > + if (IS_ERR(rtc->rtcdev)) { -> + ret =3D PTR_ERR(rtc->rtcdev); +> + ret = PTR_ERR(rtc->rtcdev); > + goto err_clk; > + } -> =20 +> > /* register irq handler after we know what name we'll use */ -> ret =3D devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt, -> @@ -460,7 +462,7 @@ static int at91_rtc_probe(struct platform_device *pde= -v) +> ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt, +> @@ -460,7 +462,7 @@ static int at91_rtc_probe(struct platform_device *pdev) > dev_name(&rtc->rtcdev->dev), rtc); > if (ret) { > dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq); > - return ret; > + goto err_clk; > } -> =20 +> > /* NOTE: sam9260 rev A silicon has a ROM bug which resets the -> @@ -474,6 +476,11 @@ static int at91_rtc_probe(struct platform_device *pd= -ev) +> @@ -474,6 +476,11 @@ static int at91_rtc_probe(struct platform_device *pdev) > dev_name(&rtc->rtcdev->dev)); -> =20 +> > return 0; > + > +err_clk: @@ -53,23 +50,10 @@ ev) > + > + return ret; > } -> =20 +> > /* ->=20 +> ---=20 +-- Nicolas Ferre - ---=20 ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N1/content_digest index 16466df..b9aa2e8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +1,15 @@ "ref\01438215872-27794-1-git-send-email-alexandre.belloni@free-electrons.com\0" - "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0[rtc-linux] Re: [PATCH 1/5] rtc: at91sam9: properly handle error case\0" + "From\0nicolas.ferre@atmel.com (Nicolas Ferre)\0" + "Subject\0[PATCH 1/5] rtc: at91sam9: properly handle error case\0" "Date\0Thu, 30 Jul 2015 11:57:05 +0200\0" - "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" - "Cc\0Boris Brezillon <boris.brezillon@free-electrons.com>" - <linux-arm-kernel@lists.infradead.org> - <rtc-linux@googlegroups.com> - Alessandro Zummo <a.zummo@towertech.it> - " <linux-kernel@vger.kernel.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" - "Le 30/07/2015 02:24, Alexandre Belloni a =C3=A9crit :\n" + "Le 30/07/2015 02:24, Alexandre Belloni a ?crit :\n" "> In case of a probe error, it is possible to abort after issuing\n" "> clk_prepare_enable(). Ensure the clock is disabled and unprepared in that\n" "> case.\n" - ">=20\n" + "> \n" "> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" "\n" "To the whole series:\n" @@ -25,39 +20,36 @@ "> ---\n" "> drivers/rtc/rtc-at91sam9.c | 13 ++++++++++---\n" "> 1 file changed, 10 insertions(+), 3 deletions(-)\n" - ">=20\n" + "> \n" "> diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c\n" "> index 5ccaee32df72..152cd816cc43 100644\n" "> --- a/drivers/rtc/rtc-at91sam9.c\n" "> +++ b/drivers/rtc/rtc-at91sam9.c\n" - "> @@ -451,8 +451,10 @@ static int at91_rtc_probe(struct platform_device *pd=\n" - "ev)\n" - "> =20\n" - "> \trtc->rtcdev =3D devm_rtc_device_register(&pdev->dev, pdev->name,\n" + "> @@ -451,8 +451,10 @@ static int at91_rtc_probe(struct platform_device *pdev)\n" + "> \n" + "> \trtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name,\n" "> \t\t\t\t\t&at91_rtc_ops, THIS_MODULE);\n" "> -\tif (IS_ERR(rtc->rtcdev))\n" "> -\t\treturn PTR_ERR(rtc->rtcdev);\n" "> +\tif (IS_ERR(rtc->rtcdev)) {\n" - "> +\t\tret =3D PTR_ERR(rtc->rtcdev);\n" + "> +\t\tret = PTR_ERR(rtc->rtcdev);\n" "> +\t\tgoto err_clk;\n" "> +\t}\n" - "> =20\n" + "> \n" "> \t/* register irq handler after we know what name we'll use */\n" - "> \tret =3D devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,\n" - "> @@ -460,7 +462,7 @@ static int at91_rtc_probe(struct platform_device *pde=\n" - "v)\n" + "> \tret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,\n" + "> @@ -460,7 +462,7 @@ static int at91_rtc_probe(struct platform_device *pdev)\n" "> \t\t\t dev_name(&rtc->rtcdev->dev), rtc);\n" "> \tif (ret) {\n" "> \t\tdev_dbg(&pdev->dev, \"can't share IRQ %d?\\n\", rtc->irq);\n" "> -\t\treturn ret;\n" "> +\t\tgoto err_clk;\n" "> \t}\n" - "> =20\n" + "> \n" "> \t/* NOTE: sam9260 rev A silicon has a ROM bug which resets the\n" - "> @@ -474,6 +476,11 @@ static int at91_rtc_probe(struct platform_device *pd=\n" - "ev)\n" + "> @@ -474,6 +476,11 @@ static int at91_rtc_probe(struct platform_device *pdev)\n" "> \t\t\t\tdev_name(&rtc->rtcdev->dev));\n" - "> =20\n" + "> \n" "> \treturn 0;\n" "> +\n" "> +err_clk:\n" @@ -65,25 +57,12 @@ "> +\n" "> +\treturn ret;\n" "> }\n" - "> =20\n" + "> \n" "> /*\n" - ">=20\n" + "> \n" "\n" "\n" - "--=20\n" - "Nicolas Ferre\n" - "\n" - "--=20\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "-- \n" + Nicolas Ferre -079ccacef6cbb45f5d623a8d3e1ac7e07a19fff2cdc6fa907d03e566aa86632f +c0773fe43fb614a8d5f7a399d3b942586b8a0d6f2272d579c5912d00c1a7e73e
diff --git a/a/1.txt b/N2/1.txt index 3cb7e48..aee5867 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -1,8 +1,8 @@ -Le 30/07/2015 02:24, Alexandre Belloni a =C3=A9crit : +Le 30/07/2015 02:24, Alexandre Belloni a écrit : > In case of a probe error, it is possible to abort after issuing > clk_prepare_enable(). Ensure the clock is disabled and unprepared in that > case. ->=20 +> > Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> To the whole series: @@ -13,39 +13,36 @@ Thanks. > --- > drivers/rtc/rtc-at91sam9.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) ->=20 +> > diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c > index 5ccaee32df72..152cd816cc43 100644 > --- a/drivers/rtc/rtc-at91sam9.c > +++ b/drivers/rtc/rtc-at91sam9.c -> @@ -451,8 +451,10 @@ static int at91_rtc_probe(struct platform_device *pd= -ev) -> =20 -> rtc->rtcdev =3D devm_rtc_device_register(&pdev->dev, pdev->name, +> @@ -451,8 +451,10 @@ static int at91_rtc_probe(struct platform_device *pdev) +> +> rtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name, > &at91_rtc_ops, THIS_MODULE); > - if (IS_ERR(rtc->rtcdev)) > - return PTR_ERR(rtc->rtcdev); > + if (IS_ERR(rtc->rtcdev)) { -> + ret =3D PTR_ERR(rtc->rtcdev); +> + ret = PTR_ERR(rtc->rtcdev); > + goto err_clk; > + } -> =20 +> > /* register irq handler after we know what name we'll use */ -> ret =3D devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt, -> @@ -460,7 +462,7 @@ static int at91_rtc_probe(struct platform_device *pde= -v) +> ret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt, +> @@ -460,7 +462,7 @@ static int at91_rtc_probe(struct platform_device *pdev) > dev_name(&rtc->rtcdev->dev), rtc); > if (ret) { > dev_dbg(&pdev->dev, "can't share IRQ %d?\n", rtc->irq); > - return ret; > + goto err_clk; > } -> =20 +> > /* NOTE: sam9260 rev A silicon has a ROM bug which resets the -> @@ -474,6 +476,11 @@ static int at91_rtc_probe(struct platform_device *pd= -ev) +> @@ -474,6 +476,11 @@ static int at91_rtc_probe(struct platform_device *pdev) > dev_name(&rtc->rtcdev->dev)); -> =20 +> > return 0; > + > +err_clk: @@ -53,23 +50,10 @@ ev) > + > + return ret; > } -> =20 +> > /* ->=20 +> ---=20 +-- Nicolas Ferre - ---=20 ---=20 -You received this message because you are subscribed to "rtc-linux". -Membership options at http://groups.google.com/group/rtc-linux . -Please read http://groups.google.com/group/rtc-linux/web/checklist -before submitting a driver. ----=20 -You received this message because you are subscribed to the Google Groups "= -rtc-linux" group. -To unsubscribe from this group and stop receiving emails from it, send an e= -mail to rtc-linux+unsubscribe@googlegroups.com. -For more options, visit https://groups.google.com/d/optout. diff --git a/a/content_digest b/N2/content_digest index 16466df..d597737 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,6 +1,6 @@ "ref\01438215872-27794-1-git-send-email-alexandre.belloni@free-electrons.com\0" "From\0Nicolas Ferre <nicolas.ferre@atmel.com>\0" - "Subject\0[rtc-linux] Re: [PATCH 1/5] rtc: at91sam9: properly handle error case\0" + "Subject\0Re: [PATCH 1/5] rtc: at91sam9: properly handle error case\0" "Date\0Thu, 30 Jul 2015 11:57:05 +0200\0" "To\0Alexandre Belloni <alexandre.belloni@free-electrons.com>\0" "Cc\0Boris Brezillon <boris.brezillon@free-electrons.com>" @@ -10,11 +10,11 @@ " <linux-kernel@vger.kernel.org>\0" "\00:1\0" "b\0" - "Le 30/07/2015 02:24, Alexandre Belloni a =C3=A9crit :\n" + "Le 30/07/2015 02:24, Alexandre Belloni a \303\251crit :\n" "> In case of a probe error, it is possible to abort after issuing\n" "> clk_prepare_enable(). Ensure the clock is disabled and unprepared in that\n" "> case.\n" - ">=20\n" + "> \n" "> Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>\n" "\n" "To the whole series:\n" @@ -25,39 +25,36 @@ "> ---\n" "> drivers/rtc/rtc-at91sam9.c | 13 ++++++++++---\n" "> 1 file changed, 10 insertions(+), 3 deletions(-)\n" - ">=20\n" + "> \n" "> diff --git a/drivers/rtc/rtc-at91sam9.c b/drivers/rtc/rtc-at91sam9.c\n" "> index 5ccaee32df72..152cd816cc43 100644\n" "> --- a/drivers/rtc/rtc-at91sam9.c\n" "> +++ b/drivers/rtc/rtc-at91sam9.c\n" - "> @@ -451,8 +451,10 @@ static int at91_rtc_probe(struct platform_device *pd=\n" - "ev)\n" - "> =20\n" - "> \trtc->rtcdev =3D devm_rtc_device_register(&pdev->dev, pdev->name,\n" + "> @@ -451,8 +451,10 @@ static int at91_rtc_probe(struct platform_device *pdev)\n" + "> \n" + "> \trtc->rtcdev = devm_rtc_device_register(&pdev->dev, pdev->name,\n" "> \t\t\t\t\t&at91_rtc_ops, THIS_MODULE);\n" "> -\tif (IS_ERR(rtc->rtcdev))\n" "> -\t\treturn PTR_ERR(rtc->rtcdev);\n" "> +\tif (IS_ERR(rtc->rtcdev)) {\n" - "> +\t\tret =3D PTR_ERR(rtc->rtcdev);\n" + "> +\t\tret = PTR_ERR(rtc->rtcdev);\n" "> +\t\tgoto err_clk;\n" "> +\t}\n" - "> =20\n" + "> \n" "> \t/* register irq handler after we know what name we'll use */\n" - "> \tret =3D devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,\n" - "> @@ -460,7 +462,7 @@ static int at91_rtc_probe(struct platform_device *pde=\n" - "v)\n" + "> \tret = devm_request_irq(&pdev->dev, rtc->irq, at91_rtc_interrupt,\n" + "> @@ -460,7 +462,7 @@ static int at91_rtc_probe(struct platform_device *pdev)\n" "> \t\t\t dev_name(&rtc->rtcdev->dev), rtc);\n" "> \tif (ret) {\n" "> \t\tdev_dbg(&pdev->dev, \"can't share IRQ %d?\\n\", rtc->irq);\n" "> -\t\treturn ret;\n" "> +\t\tgoto err_clk;\n" "> \t}\n" - "> =20\n" + "> \n" "> \t/* NOTE: sam9260 rev A silicon has a ROM bug which resets the\n" - "> @@ -474,6 +476,11 @@ static int at91_rtc_probe(struct platform_device *pd=\n" - "ev)\n" + "> @@ -474,6 +476,11 @@ static int at91_rtc_probe(struct platform_device *pdev)\n" "> \t\t\t\tdev_name(&rtc->rtcdev->dev));\n" - "> =20\n" + "> \n" "> \treturn 0;\n" "> +\n" "> +err_clk:\n" @@ -65,25 +62,12 @@ "> +\n" "> +\treturn ret;\n" "> }\n" - "> =20\n" + "> \n" "> /*\n" - ">=20\n" + "> \n" "\n" "\n" - "--=20\n" - "Nicolas Ferre\n" - "\n" - "--=20\n" - "--=20\n" - "You received this message because you are subscribed to \"rtc-linux\".\n" - "Membership options at http://groups.google.com/group/rtc-linux .\n" - "Please read http://groups.google.com/group/rtc-linux/web/checklist\n" - "before submitting a driver.\n" - "---=20\n" - "You received this message because you are subscribed to the Google Groups \"=\n" - "rtc-linux\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an e=\n" - "mail to rtc-linux+unsubscribe@googlegroups.com.\n" - For more options, visit https://groups.google.com/d/optout. + "-- \n" + Nicolas Ferre -079ccacef6cbb45f5d623a8d3e1ac7e07a19fff2cdc6fa907d03e566aa86632f +8a49289df8406cd2a6ac3a2a4af507d37683091649258f06307279e49aaf4b7e
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.