From cad13bfb76227b6087d4da5c1fa55b6f67c013ce Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Fri, 21 Sep 2012 14:35:18 +0800 Subject: [PATCH] --- yaml --- r: 336472 b: refs/heads/master c: cdfed3b21f10ecd1566c7d5b8d40f05b18d52bda h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk-fixed-rate.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a3c3f43c503a..1ddcee64539e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f896ac0be9a0c7739033ef1f8821223f4a6a908 +refs/heads/master: cdfed3b21f10ecd1566c7d5b8d40f05b18d52bda diff --git a/trunk/drivers/clk/clk-fixed-rate.c b/trunk/drivers/clk/clk-fixed-rate.c index f5ec0eebd4d7..af78ed6b67ef 100644 --- a/trunk/drivers/clk/clk-fixed-rate.c +++ b/trunk/drivers/clk/clk-fixed-rate.c @@ -97,7 +97,7 @@ void __init of_fixed_clk_setup(struct device_node *node) of_property_read_string(node, "clock-output-names", &clk_name); clk = clk_register_fixed_rate(NULL, clk_name, NULL, CLK_IS_ROOT, rate); - if (clk) + if (!IS_ERR(clk)) of_clk_add_provider(node, of_clk_src_simple_get, clk); } EXPORT_SYMBOL_GPL(of_fixed_clk_setup);