projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
drivers
/
pwm
/
pwm-brcmstb.c
diff --git
a/drivers/pwm/pwm-brcmstb.c
b/drivers/pwm/pwm-brcmstb.c
index
8b1d1e7
..
3b529f8
100644
(file)
--- a/
drivers/pwm/pwm-brcmstb.c
+++ b/
drivers/pwm/pwm-brcmstb.c
@@
-282,12
+282,11
@@
out_clk:
static int brcmstb_pwm_remove(struct platform_device *pdev)
{
struct brcmstb_pwm *p = platform_get_drvdata(pdev);
static int brcmstb_pwm_remove(struct platform_device *pdev)
{
struct brcmstb_pwm *p = platform_get_drvdata(pdev);
- int ret;
-
ret =
pwmchip_remove(&p->chip);
+ pwmchip_remove(&p->chip);
clk_disable_unprepare(p->clk);
clk_disable_unprepare(p->clk);
- return
ret
;
+ return
0
;
}
#ifdef CONFIG_PM_SLEEP
}
#ifdef CONFIG_PM_SLEEP