From 0735efd8fcad623bd8c5d2e1c1acee1835bc6e37 Mon Sep 17 00:00:00 2001 From: Rajendra Nayak Date: Mon, 26 Mar 2012 19:01:48 +0530 Subject: [PATCH] --- yaml --- r: 308197 b: refs/heads/master c: 34e44fe87437b6a5aad856f15f7a849e5fc137aa h: refs/heads/master i: 308195: db9f552846bf10d866207b4c2d95ee38cb1fe475 v: v3 --- [refs] | 2 +- trunk/drivers/clk/clk.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 85e9eecef055..cf4643c9d743 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bffad66e31fe9d94cd096f2e4de7c683e1ae32ef +refs/heads/master: 34e44fe87437b6a5aad856f15f7a849e5fc137aa diff --git a/trunk/drivers/clk/clk.c b/trunk/drivers/clk/clk.c index 9924aec17aad..a24b121747ac 100644 --- a/trunk/drivers/clk/clk.c +++ b/trunk/drivers/clk/clk.c @@ -285,7 +285,7 @@ unsigned long __clk_get_rate(struct clk *clk) unsigned long ret; if (!clk) { - ret = -EINVAL; + ret = 0; goto out; } @@ -295,7 +295,7 @@ unsigned long __clk_get_rate(struct clk *clk) goto out; if (!clk->parent) - ret = -ENODEV; + ret = 0; out: return ret; @@ -560,7 +560,7 @@ EXPORT_SYMBOL_GPL(clk_enable); * @clk: the clk whose rate is being returned * * Simply returns the cached rate of the clk. Does not query the hardware. If - * clk is NULL then returns -EINVAL. + * clk is NULL then returns 0. */ unsigned long clk_get_rate(struct clk *clk) {