Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 308197
b: refs/heads/master
c: 34e44fe
h: refs/heads/master
i:
  308195: db9f552
v: v3
  • Loading branch information
Rajendra Nayak authored and Mike Turquette committed Apr 24, 2012
1 parent db3d95a commit 0735efd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: bffad66e31fe9d94cd096f2e4de7c683e1ae32ef
refs/heads/master: 34e44fe87437b6a5aad856f15f7a849e5fc137aa
6 changes: 3 additions & 3 deletions trunk/drivers/clk/clk.c
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ unsigned long __clk_get_rate(struct clk *clk)
unsigned long ret;

if (!clk) {
ret = -EINVAL;
ret = 0;
goto out;
}

Expand All @@ -295,7 +295,7 @@ unsigned long __clk_get_rate(struct clk *clk)
goto out;

if (!clk->parent)
ret = -ENODEV;
ret = 0;

out:
return ret;
Expand Down Expand Up @@ -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)
{
Expand Down

0 comments on commit 0735efd

Please sign in to comment.