Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 373588
b: refs/heads/master
c: 563861c
h: refs/heads/master
v: v3
  • Loading branch information
Axel Lin authored and Thierry Reding committed Apr 2, 2013
1 parent 4a7e0ad commit 48c952a
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b343a1887ea4f798758d0023838d16a428f728d5
refs/heads/master: 563861cd633ae52932843477bb6ca3f1c9e2f78b
6 changes: 3 additions & 3 deletions trunk/drivers/pwm/pwm-spear.c
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ static int spear_pwm_enable(struct pwm_chip *chip, struct pwm_device *pwm)
u32 val;

rc = clk_enable(pc->clk);
if (!rc)
if (rc)
return rc;

val = spear_pwm_readl(pc, pwm->hwpwm, PWMCR);
Expand Down Expand Up @@ -209,12 +209,12 @@ static int spear_pwm_probe(struct platform_device *pdev)
pc->chip.npwm = NUM_PWM;

ret = clk_prepare(pc->clk);
if (!ret)
if (ret)
return ret;

if (of_device_is_compatible(np, "st,spear1340-pwm")) {
ret = clk_enable(pc->clk);
if (!ret) {
if (ret) {
clk_unprepare(pc->clk);
return ret;
}
Expand Down

0 comments on commit 48c952a

Please sign in to comment.