| Date: | 2010-06-28 03:07:18 (13 years 5 months ago) |
|---|---|
| Author: | Lars C. |
| Commit: | 3b8a52aa67cb2942d8ffc579c6d23b37b8eb6b98 |
| Message: | MIPS: jz4740: PWM: Fix handling if the pwm clock is not available |
| Files: |
arch/mips/jz4740/pwm.c (2 diffs) |
Change Details
| arch/mips/jz4740/pwm.c | ||
|---|---|---|
| 48 | 48 | int ret = 0; |
| 49 | 49 | struct pwm_device *pwm; |
| 50 | 50 | |
| 51 | if (!jz4740_pwm_clk) { | |
| 52 | jz4740_pwm_clk = clk_get(NULL, "ext"); | |
| 53 | ||
| 54 | if (IS_ERR(jz4740_pwm_clk)) | |
| 55 | return ERR_PTR(PTR_ERR(jz4740_pwm_clk)); | |
| 56 | } | |
| 57 | ||
| 58 | if (id < 2 || id > 7) { | |
| 51 | if (id < 2 || id > 7 || !jz4740_pwm_clk) | |
| 59 | 52 | return ERR_PTR(-ENOENT); |
| 60 | } | |
| 61 | 53 | |
| 62 | 54 | mutex_lock(&jz4740_pwm_mutex); |
| 63 | 55 | |
| ... | ... | |
| 172 | 164 | jz4740_timer_disable(pwm->id); |
| 173 | 165 | jz4740_timer_set_ctrl(pwm->id, ctrl); |
| 174 | 166 | } |
| 167 | ||
| 168 | static int __init jz4740_pwm_init(void) | |
| 169 | { | |
| 170 | int ret = 0; | |
| 171 | ||
| 172 | jz4740_pwm_clk = clk_get(NULL, "ext"); | |
| 173 | ||
| 174 | if (IS_ERR(jz4740_pwm_clk)) { | |
| 175 | ret = PTR_ERR(jz4740_pwm_clk); | |
| 176 | jz4740_pwm_clk = NULL; | |
| 177 | } | |
| 178 | ||
| 179 | return ret; | |
| 180 | } | |
| 181 | arch_initcall(jz4740_pwm_init); | |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9
