From d16a5a0213a53db42abff930af7f60904cdde13e Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Sun, 1 Jul 2012 13:00:51 +0800 Subject: [PATCH] --- yaml --- r: 319222 b: refs/heads/master c: 0c8f527d8c80a027b46798127a6dd815b4bb99c2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/pwm/pwm-tegra.c | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 8ac37ac073f4..289ac237f6cf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 457fd768ee1f7c78e85dfbe86329e6b24eb36514 +refs/heads/master: 0c8f527d8c80a027b46798127a6dd815b4bb99c2 diff --git a/trunk/drivers/pwm/pwm-tegra.c b/trunk/drivers/pwm/pwm-tegra.c index 472b74e8221a..02ce18d5e49a 100644 --- a/trunk/drivers/pwm/pwm-tegra.c +++ b/trunk/drivers/pwm/pwm-tegra.c @@ -194,7 +194,7 @@ static int tegra_pwm_probe(struct platform_device *pdev) platform_set_drvdata(pdev, pwm); - pwm->clk = clk_get(&pdev->dev, NULL); + pwm->clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(pwm->clk)) return PTR_ERR(pwm->clk); @@ -206,7 +206,6 @@ static int tegra_pwm_probe(struct platform_device *pdev) ret = pwmchip_add(&pwm->chip); if (ret < 0) { dev_err(&pdev->dev, "pwmchip_add() failed: %d\n", ret); - clk_put(pwm->clk); return ret; } @@ -233,10 +232,7 @@ static int __devexit tegra_pwm_remove(struct platform_device *pdev) clk_disable_unprepare(pc->clk); } - pwmchip_remove(&pc->chip); - clk_put(pc->clk); - - return 0; + return pwmchip_remove(&pc->chip); } #ifdef CONFIG_OF