diff for duplicates of <3768709.fnQSsPk3or@diego> diff --git a/a/1.txt b/N1/1.txt index 01b62fa..46e0ec0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,19 +1,17 @@ Hi Shawn, -Am Sonntag, 13. M=E4rz 2016, 00:26:02 schrieb Shawn Lin: +Am Sonntag, 13. März 2016, 00:26:02 schrieb Shawn Lin: > --- a/drivers/clk/rockchip/clk-pll.c > +++ b/drivers/clk/rockchip/clk-pll.c > @@ -733,7 +733,7 @@ static int rockchip_rk3399_pll_set_params(struct > rockchip_clk_pll *pll, /* wait for the pll to lock */ -> =09ret =3D rockchip_rk3399_pll_wait_lock(pll); -> =09if (ret) { -> -=09=09pr_warn("%s: pll update unsucessful, trying to restore old par= -ams\n", -> +=09=09pr_warn("%s: pll update unsuccessful, trying to restore old pa= -rams\n", -> =09=09=09__func__); -> =09=09rockchip_rk3399_pll_set_params(pll, &cur); -> =09} +> ret = rockchip_rk3399_pll_wait_lock(pll); +> if (ret) { +> - pr_warn("%s: pll update unsucessful, trying to restore old params\n", +> + pr_warn("%s: pll update unsuccessful, trying to restore old params\n", +> __func__); +> rockchip_rk3399_pll_set_params(pll, &cur); +> } I've folded that fix into the original pll addition [0] @@ -21,6 +19,4 @@ Thanks for catching that Heiko -[0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.g= -it/commit/?h=3Dv4.7-clk/next&id=3D95e0c473a0ac1bdac25f55678dc602eb50dae= -684 +[0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/commit/?h=v4.7-clk/next&id=95e0c473a0ac1bdac25f55678dc602eb50dae684 diff --git a/a/content_digest b/N1/content_digest index 8bcba64..c37b695 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -14,20 +14,18 @@ "b\0" "Hi Shawn,\n" "\n" - "Am Sonntag, 13. M=E4rz 2016, 00:26:02 schrieb Shawn Lin:\n" + "Am Sonntag, 13. M\303\244rz 2016, 00:26:02 schrieb Shawn Lin:\n" "> --- a/drivers/clk/rockchip/clk-pll.c\n" "> +++ b/drivers/clk/rockchip/clk-pll.c\n" "> @@ -733,7 +733,7 @@ static int rockchip_rk3399_pll_set_params(struct\n" "> rockchip_clk_pll *pll, /* wait for the pll to lock */\n" - "> =09ret =3D rockchip_rk3399_pll_wait_lock(pll);\n" - "> =09if (ret) {\n" - "> -=09=09pr_warn(\"%s: pll update unsucessful, trying to restore old par=\n" - "ams\\n\",\n" - "> +=09=09pr_warn(\"%s: pll update unsuccessful, trying to restore old pa=\n" - "rams\\n\",\n" - "> =09=09=09__func__);\n" - "> =09=09rockchip_rk3399_pll_set_params(pll, &cur);\n" - "> =09}\n" + "> \tret = rockchip_rk3399_pll_wait_lock(pll);\n" + "> \tif (ret) {\n" + "> -\t\tpr_warn(\"%s: pll update unsucessful, trying to restore old params\\n\",\n" + "> +\t\tpr_warn(\"%s: pll update unsuccessful, trying to restore old params\\n\",\n" + "> \t\t\t__func__);\n" + "> \t\trockchip_rk3399_pll_set_params(pll, &cur);\n" + "> \t}\n" "\n" "I've folded that fix into the original pll addition [0]\n" "\n" @@ -35,8 +33,6 @@ "Heiko\n" "\n" "\n" - "[0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.g=\n" - "it/commit/?h=3Dv4.7-clk/next&id=3D95e0c473a0ac1bdac25f55678dc602eb50dae=\n" - 684 + [0] https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/commit/?h=v4.7-clk/next&id=95e0c473a0ac1bdac25f55678dc602eb50dae684 -55fc365b699f514f7722631f4fdd067d0b61c90926f2bbbf8b32a28fed23a87b +b2df3bcb01c40a9178d8f0a06d8c9b8f69a4fe6f4e0fa36cc95b362e2b02052e
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.