diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-04 11:45:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-04 11:45:35 -0700 |
| commit | 3c06806e690885ce978ef180c8f8b6f8c17fb4b4 (patch) | |
| tree | ad81aba3744848d97df016f21e63390ab6fe0752 /arch/powerpc/platforms/512x | |
| parent | d9f73afcd364eb02b355921f6101db9e7ee4001c (diff) | |
| parent | fa32154e47a203688453e53c1369fcbc63b06a21 (diff) | |
| download | linux-3c06806e690885ce978ef180c8f8b6f8c17fb4b4.tar.gz | |
Merge branch 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6
* 'merge-powerpc' of git://git.secretlab.ca/git/linux-2.6:
powerpc/5200: tighten up ac97 reset timing
powerpc/5200: efika.c: Add of_node_put to avoid memory leak
powerpc/512x: fix clk_get() return value
Diffstat (limited to 'arch/powerpc/platforms/512x')
| -rw-r--r-- | arch/powerpc/platforms/512x/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c index 5b243bd3eb3b..3dc2a8d262b8 100644 --- a/arch/powerpc/platforms/512x/clock.c +++ b/arch/powerpc/platforms/512x/clock.c @@ -57,7 +57,7 @@ static struct clk *mpc5121_clk_get(struct device *dev, const char *id) int id_match = 0; if (dev == NULL || id == NULL) - return NULL; + return clk; mutex_lock(&clocks_mutex); list_for_each_entry(p, &clocks, node) { |