diff for duplicates of <562744A9.1070705@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 97e92d8..2e74feb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -103,7 +103,7 @@ On 21-10-15 07:59, Chen-Yu Tsai wrote: > + strlen(prop->name) - sizeof(SUPPLY_SUFFIX) + 1); > + regulator = devm_regulator_get_optional(&pdev->dev, name); > + if (IS_ERR(regulator)) { -> + if (PTR_ERR(regulator) = -EPROBE_DEFER) +> + if (PTR_ERR(regulator) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > + dev_err(&pdev->dev, "regulator %s not found: %ld\n", > + name, PTR_ERR(regulator)); diff --git a/a/content_digest b/N1/content_digest index 4949c6f..973e8db 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,8 +1,8 @@ "ref\01445407141-16459-1-git-send-email-wens@csie.org\0" "ref\01445407141-16459-3-git-send-email-wens@csie.org\0" - "From\0Hans de Goede <hdegoede@redhat.com>\0" - "Subject\0Re: [PATCH RFC v2 2/2] simplefb: Claim and enable regulators\0" - "Date\0Wed, 21 Oct 2015 07:54:17 +0000\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH RFC v2 2/2] simplefb: Claim and enable regulators\0" + "Date\0Wed, 21 Oct 2015 09:54:17 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -111,7 +111,7 @@ "> +\t\t\tstrlen(prop->name) - sizeof(SUPPLY_SUFFIX) + 1);\n" "> +\t\tregulator = devm_regulator_get_optional(&pdev->dev, name);\n" "> +\t\tif (IS_ERR(regulator)) {\n" - "> +\t\t\tif (PTR_ERR(regulator) = -EPROBE_DEFER)\n" + "> +\t\t\tif (PTR_ERR(regulator) == -EPROBE_DEFER)\n" "> +\t\t\t\treturn -EPROBE_DEFER;\n" "> +\t\t\tdev_err(&pdev->dev, \"regulator %s not found: %ld\\n\",\n" "> +\t\t\t\tname, PTR_ERR(regulator));\n" @@ -218,4 +218,4 @@ ">\n" > -de6fcb6e83f72a3efaf812700e591c61caa7854d531854c7f003def51a29ec4f +55a387c093913ebf6d90a6dc7b6a319fe9be1a2796369a24affd17c415feb639
diff --git a/a/1.txt b/N2/1.txt index 97e92d8..2e74feb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -103,7 +103,7 @@ On 21-10-15 07:59, Chen-Yu Tsai wrote: > + strlen(prop->name) - sizeof(SUPPLY_SUFFIX) + 1); > + regulator = devm_regulator_get_optional(&pdev->dev, name); > + if (IS_ERR(regulator)) { -> + if (PTR_ERR(regulator) = -EPROBE_DEFER) +> + if (PTR_ERR(regulator) == -EPROBE_DEFER) > + return -EPROBE_DEFER; > + dev_err(&pdev->dev, "regulator %s not found: %ld\n", > + name, PTR_ERR(regulator)); diff --git a/a/content_digest b/N2/content_digest index 4949c6f..d5d4475 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,8 +2,20 @@ "ref\01445407141-16459-3-git-send-email-wens@csie.org\0" "From\0Hans de Goede <hdegoede@redhat.com>\0" "Subject\0Re: [PATCH RFC v2 2/2] simplefb: Claim and enable regulators\0" - "Date\0Wed, 21 Oct 2015 07:54:17 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Wed, 21 Oct 2015 09:54:17 +0200\0" + "To\0Chen-Yu Tsai <wens@csie.org>" + Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com> + Tomi Valkeinen <tomi.valkeinen@ti.com> + Rob Herring <robh+dt@kernel.org> + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + " Kumar Gala <galak@codeaurora.org>\0" + "Cc\0linux-fbdev@vger.kernel.org" + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " Mark Brown <broonie@kernel.org>\0" "\00:1\0" "b\0" "Hi,\n" @@ -111,7 +123,7 @@ "> +\t\t\tstrlen(prop->name) - sizeof(SUPPLY_SUFFIX) + 1);\n" "> +\t\tregulator = devm_regulator_get_optional(&pdev->dev, name);\n" "> +\t\tif (IS_ERR(regulator)) {\n" - "> +\t\t\tif (PTR_ERR(regulator) = -EPROBE_DEFER)\n" + "> +\t\t\tif (PTR_ERR(regulator) == -EPROBE_DEFER)\n" "> +\t\t\t\treturn -EPROBE_DEFER;\n" "> +\t\t\tdev_err(&pdev->dev, \"regulator %s not found: %ld\\n\",\n" "> +\t\t\t\tname, PTR_ERR(regulator));\n" @@ -218,4 +230,4 @@ ">\n" > -de6fcb6e83f72a3efaf812700e591c61caa7854d531854c7f003def51a29ec4f +92c8bbc981d8c89749bbefef6455bb4026fcaa067c6e66f45a3f1ea5e73c5bc9
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.