diff for duplicates of <20140408001339.GA15842@atomide.com> diff --git a/a/1.txt b/N1/1.txt index 72622fe..c72eb2d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -72,7 +72,7 @@ Tony > + int gpio; > + > + gpio = of_get_gpio(node, 0); -> + if (gpio_is_valid(gpio) || gpio = -ENOENT) { +> + if (gpio_is_valid(gpio) || gpio == -ENOENT) { > + ddata->enable_gpio = gpio; > + } else { > + dev_err(&pdev->dev, "failed to parse enable gpio\n"); @@ -80,7 +80,7 @@ Tony > + } > + > + gpio = of_get_gpio(node, 1); -> + if (gpio_is_valid(gpio) || gpio = -ENOENT) { +> + if (gpio_is_valid(gpio) || gpio == -ENOENT) { > + ddata->backlight_gpio = gpio; > + } else { > + dev_err(&pdev->dev, "failed to parse backlight gpio\n"); diff --git a/a/content_digest b/N1/content_digest index 0243048..5b9527e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,8 +2,24 @@ "ref\01390301833-24944-20-git-send-email-tomi.valkeinen@ti.com\0" "From\0Tony Lindgren <tony@atomide.com>\0" "Subject\0Re: [PATCHv3 19/41] OMAPDSS: panel-dpi: Add DT support\0" - "Date\0Tue, 08 Apr 2014 00:13:39 +0000\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Date\0Mon, 7 Apr 2014 17:13:39 -0700\0" + "To\0Tomi Valkeinen <tomi.valkeinen@ti.com>\0" + "Cc\0linux-arm-kernel@lists.infradead.org" + linux-omap@vger.kernel.org + linux-fbdev@vger.kernel.org + devicetree@vger.kernel.org + Archit Taneja <archit@ti.com> + Darren Etheridge <detheridge@ti.com> + Laurent Pinchart <laurent.pinchart@ideasonboard.com> + Stefan Roese <stefan.roese@gmail.com> + Sebastian Reichel <sre@debian.org> + Robert Nelson <robertcnelson@gmail.com> + Dr . H . Nikolaus Schaller <hns@goldelico.com> + Marek Belisko <marek@goldelico.com> + Sebastian Reichel <sre@ring0.de> + Javier Martinez Canillas <javier@dowhile0.org> + Enric Balletbo Serra <eballetbo@gmail.com> + " Florian Vaussard <florian.vaussard@epfl.ch>\0" "\00:1\0" "b\0" "Tomi,\n" @@ -80,7 +96,7 @@ "> +\tint gpio;\n" "> +\n" "> +\tgpio = of_get_gpio(node, 0);\n" - "> +\tif (gpio_is_valid(gpio) || gpio = -ENOENT) {\n" + "> +\tif (gpio_is_valid(gpio) || gpio == -ENOENT) {\n" "> +\t\tddata->enable_gpio = gpio;\n" "> +\t} else {\n" "> +\t\tdev_err(&pdev->dev, \"failed to parse enable gpio\\n\");\n" @@ -88,7 +104,7 @@ "> +\t}\n" "> +\n" "> +\tgpio = of_get_gpio(node, 1);\n" - "> +\tif (gpio_is_valid(gpio) || gpio = -ENOENT) {\n" + "> +\tif (gpio_is_valid(gpio) || gpio == -ENOENT) {\n" "> +\t\tddata->backlight_gpio = gpio;\n" "> +\t} else {\n" "> +\t\tdev_err(&pdev->dev, \"failed to parse backlight gpio\\n\");\n" @@ -154,4 +170,4 @@ "> 1.8.3.2\n" > -5f0a6b91beb4edd6bc32baa874ae53360c72c7d187e939fb69a3788d965c3de7 +523e8575cbafd7f3b429ff19be85e1a6e8357df22a0d9f68d3839de7aaed73e0
diff --git a/a/1.txt b/N2/1.txt index 72622fe..c72eb2d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -72,7 +72,7 @@ Tony > + int gpio; > + > + gpio = of_get_gpio(node, 0); -> + if (gpio_is_valid(gpio) || gpio = -ENOENT) { +> + if (gpio_is_valid(gpio) || gpio == -ENOENT) { > + ddata->enable_gpio = gpio; > + } else { > + dev_err(&pdev->dev, "failed to parse enable gpio\n"); @@ -80,7 +80,7 @@ Tony > + } > + > + gpio = of_get_gpio(node, 1); -> + if (gpio_is_valid(gpio) || gpio = -ENOENT) { +> + if (gpio_is_valid(gpio) || gpio == -ENOENT) { > + ddata->backlight_gpio = gpio; > + } else { > + dev_err(&pdev->dev, "failed to parse backlight gpio\n"); diff --git a/a/content_digest b/N2/content_digest index 0243048..f690aa3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,8 @@ "ref\01390301833-24944-1-git-send-email-tomi.valkeinen@ti.com\0" "ref\01390301833-24944-20-git-send-email-tomi.valkeinen@ti.com\0" - "From\0Tony Lindgren <tony@atomide.com>\0" - "Subject\0Re: [PATCHv3 19/41] OMAPDSS: panel-dpi: Add DT support\0" - "Date\0Tue, 08 Apr 2014 00:13:39 +0000\0" + "From\0tony@atomide.com (Tony Lindgren)\0" + "Subject\0[PATCHv3 19/41] OMAPDSS: panel-dpi: Add DT support\0" + "Date\0Mon, 7 Apr 2014 17:13:39 -0700\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" @@ -80,7 +80,7 @@ "> +\tint gpio;\n" "> +\n" "> +\tgpio = of_get_gpio(node, 0);\n" - "> +\tif (gpio_is_valid(gpio) || gpio = -ENOENT) {\n" + "> +\tif (gpio_is_valid(gpio) || gpio == -ENOENT) {\n" "> +\t\tddata->enable_gpio = gpio;\n" "> +\t} else {\n" "> +\t\tdev_err(&pdev->dev, \"failed to parse enable gpio\\n\");\n" @@ -88,7 +88,7 @@ "> +\t}\n" "> +\n" "> +\tgpio = of_get_gpio(node, 1);\n" - "> +\tif (gpio_is_valid(gpio) || gpio = -ENOENT) {\n" + "> +\tif (gpio_is_valid(gpio) || gpio == -ENOENT) {\n" "> +\t\tddata->backlight_gpio = gpio;\n" "> +\t} else {\n" "> +\t\tdev_err(&pdev->dev, \"failed to parse backlight gpio\\n\");\n" @@ -154,4 +154,4 @@ "> 1.8.3.2\n" > -5f0a6b91beb4edd6bc32baa874ae53360c72c7d187e939fb69a3788d965c3de7 +0133ea41e9c0d24d7b93dfc3a83c60ae39339b8d88c02c9996e9c25cb42ec978
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.