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-imx-tpm.c
diff --git
a/drivers/pwm/pwm-imx-tpm.c
b/drivers/pwm/pwm-imx-tpm.c
index
dbb5049
..
e5e7b7c
100644
(file)
--- a/
drivers/pwm/pwm-imx-tpm.c
+++ b/
drivers/pwm/pwm-imx-tpm.c
@@
-382,11
+382,12
@@
static int pwm_imx_tpm_probe(struct platform_device *pdev)
static int pwm_imx_tpm_remove(struct platform_device *pdev)
{
struct imx_tpm_pwm_chip *tpm = platform_get_drvdata(pdev);
static int pwm_imx_tpm_remove(struct platform_device *pdev)
{
struct imx_tpm_pwm_chip *tpm = platform_get_drvdata(pdev);
- int ret = pwmchip_remove(&tpm->chip);
+
+ pwmchip_remove(&tpm->chip);
clk_disable_unprepare(tpm->clk);
clk_disable_unprepare(tpm->clk);
- return
ret
;
+ return
0
;
}
static int __maybe_unused pwm_imx_tpm_suspend(struct device *dev)
}
static int __maybe_unused pwm_imx_tpm_suspend(struct device *dev)