diff for duplicates of <20150514100500.GA19426@mwanda> diff --git a/a/1.txt b/N1/1.txt index 2ab2985..35d47e1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,14 +11,14 @@ index 4de7ee5..4701b093 100644 +++ b/drivers/clk/h8300/clk-h8s2678.c @@ -107,13 +107,13 @@ static void __init h8s2678_pll_clk_setup(struct device_node *node) pll_clock->sckcr = of_iomap(node, 0); - if (pll_clock->sckcr = NULL) { + if (pll_clock->sckcr == NULL) { pr_err("%s: failed to map divide register", clk_name); - goto error; + goto free_clock; } pll_clock->pllcr = of_iomap(node, 1); - if (pll_clock->pllcr = NULL) { + if (pll_clock->pllcr == NULL) { pr_err("%s: failed to map multiply register", clk_name); - goto error; + goto unmap_sckcr; diff --git a/a/content_digest b/N1/content_digest index bb14482..4a38280 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Dan Carpenter <dan.carpenter@oracle.com>\0" "Subject\0[patch -next] clk: h8300: fix error handling in h8s2678_pll_clk_setup()\0" - "Date\0Thu, 14 May 2015 10:05:00 +0000\0" + "Date\0Thu, 14 May 2015 13:05:00 +0300\0" "To\0Yoshinori Sato <ysato@users.sourceforge.jp>\0" "Cc\0Mike Turquette <mturquette@linaro.org>" Stephen Boyd <sboyd@codeaurora.org> @@ -22,14 +22,14 @@ "+++ b/drivers/clk/h8300/clk-h8s2678.c\n" "@@ -107,13 +107,13 @@ static void __init h8s2678_pll_clk_setup(struct device_node *node)\n" " \tpll_clock->sckcr = of_iomap(node, 0);\n" - " \tif (pll_clock->sckcr = NULL) {\n" + " \tif (pll_clock->sckcr == NULL) {\n" " \t\tpr_err(\"%s: failed to map divide register\", clk_name);\n" "-\t\tgoto error;\n" "+\t\tgoto free_clock;\n" " \t}\n" " \n" " \tpll_clock->pllcr = of_iomap(node, 1);\n" - " \tif (pll_clock->pllcr = NULL) {\n" + " \tif (pll_clock->pllcr == NULL) {\n" " \t\tpr_err(\"%s: failed to map multiply register\", clk_name);\n" "-\t\tgoto error;\n" "+\t\tgoto unmap_sckcr;\n" @@ -74,4 +74,4 @@ " \n" " CLK_OF_DECLARE(h8s2678_div_clk, \"renesas,h8s2678-pll-clock\"," -21cb5fd5a5080ffd342eab2146687ac9c6a93bea1ee2d2897f8517c01fcba6ba +295e829abd70e19de923dbd458191df38c31dd51b6e630073684345f062bc5f4
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.