diff for duplicates of <20190722134423.26555-5-brgl@bgdev.pl> diff --git a/a/1.txt b/N1/1.txt index 8d750db..0d2e6fe 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -88,7 +88,7 @@ index b1cf248f3291..02dfe9e32eed 100644 + par->lcd_supply = devm_regulator_get_optional(&device->dev, "lcd"); + if (IS_ERR(par->lcd_supply)) { -+ if (PTR_ERR(par->lcd_supply) = -EPROBE_DEFER) { ++ if (PTR_ERR(par->lcd_supply) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + goto err_pm_runtime_disable; + } @@ -130,7 +130,7 @@ index b1cf248f3291..02dfe9e32eed 100644 console_lock(); pm_runtime_get_sync(dev); @@ -1627,8 +1666,13 @@ static int fb_resume(struct device *dev) - if (par->blank = FB_BLANK_UNBLANK) { + if (par->blank == FB_BLANK_UNBLANK) { lcd_enable_raster(); - if (par->panel_power_ctrl) @@ -146,3 +146,9 @@ index b1cf248f3291..02dfe9e32eed 100644 fb_set_suspend(info, 0); -- 2.21.0 + + +_______________________________________________ +linux-arm-kernel mailing list +linux-arm-kernel@lists.infradead.org +http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/a/content_digest b/N1/content_digest index bd68c02..aa4de02 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020190722134423.26555-1-brgl@bgdev.pl\0" "From\0Bartosz Golaszewski <brgl@bgdev.pl>\0" "Subject\0[PATCH v2 4/9] fbdev: da8xx: add support for a regulator\0" - "Date\0Mon, 22 Jul 2019 13:44:18 +0000\0" + "Date\0Mon, 22 Jul 2019 15:44:18 +0200\0" "To\0Sekhar Nori <nsekhar@ti.com>" Kevin Hilman <khilman@kernel.org> Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> @@ -103,7 +103,7 @@ " \n" "+\tpar->lcd_supply = devm_regulator_get_optional(&device->dev, \"lcd\");\n" "+\tif (IS_ERR(par->lcd_supply)) {\n" - "+\t\tif (PTR_ERR(par->lcd_supply) = -EPROBE_DEFER) {\n" + "+\t\tif (PTR_ERR(par->lcd_supply) == -EPROBE_DEFER) {\n" "+\t\t\tret = -EPROBE_DEFER;\n" "+\t\t\tgoto err_pm_runtime_disable;\n" "+\t\t}\n" @@ -145,7 +145,7 @@ " \tconsole_lock();\n" " \tpm_runtime_get_sync(dev);\n" "@@ -1627,8 +1666,13 @@ static int fb_resume(struct device *dev)\n" - " \tif (par->blank = FB_BLANK_UNBLANK) {\n" + " \tif (par->blank == FB_BLANK_UNBLANK) {\n" " \t\tlcd_enable_raster();\n" " \n" "-\t\tif (par->panel_power_ctrl)\n" @@ -160,6 +160,12 @@ " \n" " \tfb_set_suspend(info, 0);\n" "-- \n" - 2.21.0 + "2.21.0\n" + "\n" + "\n" + "_______________________________________________\n" + "linux-arm-kernel mailing list\n" + "linux-arm-kernel@lists.infradead.org\n" + http://lists.infradead.org/mailman/listinfo/linux-arm-kernel -9fa82726c00ef188f6319752f695f51acdfe68adff22cad8166c6a3395ec6697 +01d14ae8a49f51a15fccc39c08c6ad6049c669f4f37baea520e09b8159a0c14d
diff --git a/a/1.txt b/N2/1.txt index 8d750db..fe1a689 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -88,7 +88,7 @@ index b1cf248f3291..02dfe9e32eed 100644 + par->lcd_supply = devm_regulator_get_optional(&device->dev, "lcd"); + if (IS_ERR(par->lcd_supply)) { -+ if (PTR_ERR(par->lcd_supply) = -EPROBE_DEFER) { ++ if (PTR_ERR(par->lcd_supply) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; + goto err_pm_runtime_disable; + } @@ -130,7 +130,7 @@ index b1cf248f3291..02dfe9e32eed 100644 console_lock(); pm_runtime_get_sync(dev); @@ -1627,8 +1666,13 @@ static int fb_resume(struct device *dev) - if (par->blank = FB_BLANK_UNBLANK) { + if (par->blank == FB_BLANK_UNBLANK) { lcd_enable_raster(); - if (par->panel_power_ctrl) diff --git a/a/content_digest b/N2/content_digest index bd68c02..2330ac8 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,16 @@ "ref\020190722134423.26555-1-brgl@bgdev.pl\0" "From\0Bartosz Golaszewski <brgl@bgdev.pl>\0" "Subject\0[PATCH v2 4/9] fbdev: da8xx: add support for a regulator\0" - "Date\0Mon, 22 Jul 2019 13:44:18 +0000\0" + "Date\0Mon, 22 Jul 2019 15:44:18 +0200\0" "To\0Sekhar Nori <nsekhar@ti.com>" Kevin Hilman <khilman@kernel.org> Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> David Lechner <david@lechnology.com> " Linus Walleij <linus.walleij@linaro.org>\0" - "Cc\0Bartosz Golaszewski <bgolaszewski@baylibre.com>" - linux-fbdev@vger.kernel.org + "Cc\0linux-arm-kernel@lists.infradead.org" linux-kernel@vger.kernel.org - " linux-arm-kernel@lists.infradead.org\0" + linux-fbdev@vger.kernel.org + " Bartosz Golaszewski <bgolaszewski@baylibre.com>\0" "\00:1\0" "b\0" "From: Bartosz Golaszewski <bgolaszewski@baylibre.com>\n" @@ -103,7 +103,7 @@ " \n" "+\tpar->lcd_supply = devm_regulator_get_optional(&device->dev, \"lcd\");\n" "+\tif (IS_ERR(par->lcd_supply)) {\n" - "+\t\tif (PTR_ERR(par->lcd_supply) = -EPROBE_DEFER) {\n" + "+\t\tif (PTR_ERR(par->lcd_supply) == -EPROBE_DEFER) {\n" "+\t\t\tret = -EPROBE_DEFER;\n" "+\t\t\tgoto err_pm_runtime_disable;\n" "+\t\t}\n" @@ -145,7 +145,7 @@ " \tconsole_lock();\n" " \tpm_runtime_get_sync(dev);\n" "@@ -1627,8 +1666,13 @@ static int fb_resume(struct device *dev)\n" - " \tif (par->blank = FB_BLANK_UNBLANK) {\n" + " \tif (par->blank == FB_BLANK_UNBLANK) {\n" " \t\tlcd_enable_raster();\n" " \n" "-\t\tif (par->panel_power_ctrl)\n" @@ -162,4 +162,4 @@ "-- \n" 2.21.0 -9fa82726c00ef188f6319752f695f51acdfe68adff22cad8166c6a3395ec6697 +092777b05474ebbacb3f5f6a9a8445c8e3e195d3eebc891a42d731b3a8d423e9
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.