diff for duplicates of <20140515182730.GE23659@atomide.com> diff --git a/a/1.txt b/N1/1.txt index c2ddc77..09b7eef 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,7 +15,7 @@ > > + > > + /* lcd INI */ > > + ddata->ini_gpio = sharp_ls_get_gpio_of(&pdev->dev, 0, 0, "enable"); -> > + if (PTR_ERR(ddata->ini_gpio) = -EPROBE_DEFER) +> > + if (PTR_ERR(ddata->ini_gpio) == -EPROBE_DEFER) > > + return -EPROBE_DEFER; > > Hmm, the GPIOs are optional, but shouldn't we react somehow to real @@ -24,7 +24,7 @@ > ddata->ini_gpio = sharp_ls_get_gpio_of(&pdev->dev, 0, 0, "enable"); > if (IS_ERR(ddata->ini_gpio) { > int err = PTR_ERR(ddata->ini_gpio); -> if (err = -EPROBE_DEFER || err != -ENOENT) +> if (err == -EPROBE_DEFER || err != -ENOENT) > return err; > } diff --git a/a/content_digest b/N1/content_digest index 8f1dba1..86d3c38 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -10,8 +10,12 @@ "ref\05374BC01.7030802@ti.com\0" "From\0Tony Lindgren <tony@atomide.com>\0" "Subject\0Re: [PATCH 3/4] OMAPDSS: panel-sharp-ls037v7dw01: add device tree support\0" - "Date\0Thu, 15 May 2014 18:27:31 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Thu, 15 May 2014 11:27:31 -0700\0" + "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + linux-fbdev@vger.kernel.org + devicetree@vger.kernel.org + " linux-omap@vger.kernel.org\0" "\00:1\0" "b\0" "* Tomi Valkeinen <tomi.valkeinen@ti.com> [140515 06:08]:\n" @@ -31,7 +35,7 @@ "> > +\n" "> > +\t/* lcd INI */\n" "> > +\tddata->ini_gpio = sharp_ls_get_gpio_of(&pdev->dev, 0, 0, \"enable\");\n" - "> > +\tif (PTR_ERR(ddata->ini_gpio) = -EPROBE_DEFER)\n" + "> > +\tif (PTR_ERR(ddata->ini_gpio) == -EPROBE_DEFER)\n" "> > +\t\treturn -EPROBE_DEFER;\n" "> \n" "> Hmm, the GPIOs are optional, but shouldn't we react somehow to real\n" @@ -40,7 +44,7 @@ "> ddata->ini_gpio = sharp_ls_get_gpio_of(&pdev->dev, 0, 0, \"enable\");\n" "> if (IS_ERR(ddata->ini_gpio) {\n" "> \tint err = PTR_ERR(ddata->ini_gpio);\n" - "> \tif (err = -EPROBE_DEFER || err != -ENOENT)\n" + "> \tif (err == -EPROBE_DEFER || err != -ENOENT)\n" "> \t\treturn err;\n" "> }\n" "\n" @@ -50,4 +54,4 @@ "\n" Tony -eb1e1187e702f845b03793709fe092a5badf4a6992758bad1b1d4f05d92594de +26a10ad5eb77429ce3e9a62299275b29c67448adeb3f947e4e325aa6ad4d48e4
diff --git a/a/1.txt b/N2/1.txt index c2ddc77..09b7eef 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -15,7 +15,7 @@ > > + > > + /* lcd INI */ > > + ddata->ini_gpio = sharp_ls_get_gpio_of(&pdev->dev, 0, 0, "enable"); -> > + if (PTR_ERR(ddata->ini_gpio) = -EPROBE_DEFER) +> > + if (PTR_ERR(ddata->ini_gpio) == -EPROBE_DEFER) > > + return -EPROBE_DEFER; > > Hmm, the GPIOs are optional, but shouldn't we react somehow to real @@ -24,7 +24,7 @@ > ddata->ini_gpio = sharp_ls_get_gpio_of(&pdev->dev, 0, 0, "enable"); > if (IS_ERR(ddata->ini_gpio) { > int err = PTR_ERR(ddata->ini_gpio); -> if (err = -EPROBE_DEFER || err != -ENOENT) +> if (err == -EPROBE_DEFER || err != -ENOENT) > return err; > } diff --git a/a/content_digest b/N2/content_digest index 8f1dba1..7d6ef25 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -8,9 +8,9 @@ "ref\020140509153008.GC17814@atomide.com\0" "ref\020140513212639.GA18001@atomide.com\0" "ref\05374BC01.7030802@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCH 3/4] OMAPDSS: panel-sharp-ls037v7dw01: add device tree support\0" - "Date\0Thu, 15 May 2014 18:27:31 +0000\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCH 3/4] OMAPDSS: panel-sharp-ls037v7dw01: add device tree support\0" + "Date\0Thu, 15 May 2014 11:27:31 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -31,7 +31,7 @@ "> > +\n" "> > +\t/* lcd INI */\n" "> > +\tddata->ini_gpio = sharp_ls_get_gpio_of(&pdev->dev, 0, 0, \"enable\");\n" - "> > +\tif (PTR_ERR(ddata->ini_gpio) = -EPROBE_DEFER)\n" + "> > +\tif (PTR_ERR(ddata->ini_gpio) == -EPROBE_DEFER)\n" "> > +\t\treturn -EPROBE_DEFER;\n" "> \n" "> Hmm, the GPIOs are optional, but shouldn't we react somehow to real\n" @@ -40,7 +40,7 @@ "> ddata->ini_gpio = sharp_ls_get_gpio_of(&pdev->dev, 0, 0, \"enable\");\n" "> if (IS_ERR(ddata->ini_gpio) {\n" "> \tint err = PTR_ERR(ddata->ini_gpio);\n" - "> \tif (err = -EPROBE_DEFER || err != -ENOENT)\n" + "> \tif (err == -EPROBE_DEFER || err != -ENOENT)\n" "> \t\treturn err;\n" "> }\n" "\n" @@ -50,4 +50,4 @@ "\n" Tony -eb1e1187e702f845b03793709fe092a5badf4a6992758bad1b1d4f05d92594de +0531687ca4b0047e8ac7ffa529755a5f84c8875c6e233d8d0a082eb6289be205
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.