aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAkinobu Mita <akinobu.mita@gmail.com>2010-08-31 17:43:51 +0900
committerGrant Likely <grant.likely@secretlab.ca>2010-09-01 09:31:06 -0600
commit59482fe5959675f180469ae95e4fcd0a15920ced (patch)
tree61393077172fdd9e64758eb1e91ffaa1c2302d84 /arch
parent2bfc96a127bc1cc94d26bfaa40159966064f9c8c (diff)
downloadmrst-s0i3-test-59482fe5959675f180469ae95e4fcd0a15920ced.tar.gz
mrst-s0i3-test-59482fe5959675f180469ae95e4fcd0a15920ced.tar.xz
mrst-s0i3-test-59482fe5959675f180469ae95e4fcd0a15920ced.zip
powerpc/512x: fix clk_get() return value
clk_get() should return an ERR_PTR value on error, not NULL. Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com> Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/512x/clock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/512x/clock.c b/arch/powerpc/platforms/512x/clock.c
index 5b243bd3eb3..3dc2a8d262b 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) {