diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:05 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-09-15 09:08:18 -0400 |
| commit | e060c38434b2caa78efe7cedaff4191040b65a15 (patch) | |
| tree | 407361230bf6733f63d8e788e4b5e6566ee04818 /arch/sh/boards/board-sh7785lcr.c | |
| parent | 10e4ac572eeffe5317019bd7330b6058a400dfc2 (diff) | |
| parent | cc39c6a9bbdebfcf1a7dee64d83bf302bc38d941 (diff) | |
Merge branch 'master' into for-next
Fast-forward merge with Linus to be able to merge patches
based on more recent version of the tree.
Diffstat (limited to 'arch/sh/boards/board-sh7785lcr.c')
| -rw-r--r-- | arch/sh/boards/board-sh7785lcr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/board-sh7785lcr.c b/arch/sh/boards/board-sh7785lcr.c index ee65ff05c55..d879848f3cd 100644 --- a/arch/sh/boards/board-sh7785lcr.c +++ b/arch/sh/boards/board-sh7785lcr.c | |||
| @@ -299,7 +299,7 @@ static int sh7785lcr_clk_init(void) | |||
| 299 | int ret; | 299 | int ret; |
| 300 | 300 | ||
| 301 | clk = clk_get(NULL, "extal"); | 301 | clk = clk_get(NULL, "extal"); |
| 302 | if (!clk || IS_ERR(clk)) | 302 | if (IS_ERR(clk)) |
| 303 | return PTR_ERR(clk); | 303 | return PTR_ERR(clk); |
| 304 | ret = clk_set_rate(clk, 33333333); | 304 | ret = clk_set_rate(clk, 33333333); |
| 305 | clk_put(clk); | 305 | clk_put(clk); |