sh: fix clk_get() error handling
clk_get() returns an ERR_PTR(errno) on error and not NULL. Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
committed by
Paul Mundt
parent
e5690e0dcf
commit
56ea510962
@@ -1248,14 +1248,14 @@ static int __init arch_setup(void)
|
|||||||
|
|
||||||
/* set SPU2 clock to 83.4 MHz */
|
/* set SPU2 clock to 83.4 MHz */
|
||||||
clk = clk_get(NULL, "spu_clk");
|
clk = clk_get(NULL, "spu_clk");
|
||||||
if (clk) {
|
if (!IS_ERR(clk)) {
|
||||||
clk_set_rate(clk, clk_round_rate(clk, 83333333));
|
clk_set_rate(clk, clk_round_rate(clk, 83333333));
|
||||||
clk_put(clk);
|
clk_put(clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* change parent of FSI B */
|
/* change parent of FSI B */
|
||||||
clk = clk_get(NULL, "fsib_clk");
|
clk = clk_get(NULL, "fsib_clk");
|
||||||
if (clk) {
|
if (!IS_ERR(clk)) {
|
||||||
clk_register(&fsimckb_clk);
|
clk_register(&fsimckb_clk);
|
||||||
clk_set_parent(clk, &fsimckb_clk);
|
clk_set_parent(clk, &fsimckb_clk);
|
||||||
clk_set_rate(clk, 11000);
|
clk_set_rate(clk, 11000);
|
||||||
@@ -1273,7 +1273,7 @@ static int __init arch_setup(void)
|
|||||||
|
|
||||||
/* set VPU clock to 166 MHz */
|
/* set VPU clock to 166 MHz */
|
||||||
clk = clk_get(NULL, "vpu_clk");
|
clk = clk_get(NULL, "vpu_clk");
|
||||||
if (clk) {
|
if (!IS_ERR(clk)) {
|
||||||
clk_set_rate(clk, clk_round_rate(clk, 166000000));
|
clk_set_rate(clk, clk_round_rate(clk, 166000000));
|
||||||
clk_put(clk);
|
clk_put(clk);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user