diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:30:25 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 12:30:25 -0400 |
| commit | 995a0605a6665858d73f9e80053414909be33f27 (patch) | |
| tree | fcc66a6a77acdaae492f77c0c58c0233db74a2b4 /arch/arm/plat-s5p/clock.c | |
| parent | a32750c2ca6f697903b19063fc86f4272865e3a1 (diff) | |
| parent | 677d3e2f07d1b3d6d2f76fd5552d16a53b9236a0 (diff) | |
Merge branch 'at91/trng' into next/driver
Diffstat (limited to 'arch/arm/plat-s5p/clock.c')
| -rw-r--r-- | arch/arm/plat-s5p/clock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s5p/clock.c b/arch/arm/plat-s5p/clock.c index 02af235298e2..5f84a3f13ef9 100644 --- a/arch/arm/plat-s5p/clock.c +++ b/arch/arm/plat-s5p/clock.c | |||
| @@ -192,7 +192,7 @@ unsigned long s5p_spdif_get_rate(struct clk *clk) | |||
| 192 | if (IS_ERR(pclk)) | 192 | if (IS_ERR(pclk)) |
| 193 | return -EINVAL; | 193 | return -EINVAL; |
| 194 | 194 | ||
| 195 | rate = pclk->ops->get_rate(clk); | 195 | rate = pclk->ops->get_rate(pclk); |
| 196 | clk_put(pclk); | 196 | clk_put(pclk); |
| 197 | 197 | ||
| 198 | return rate; | 198 | return rate; |