From 1992d940880ca24d46a2c14bf38cbdfc83a8c20c Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Thu, 27 Dec 2012 15:38:24 +0100 Subject: [PATCH] --- yaml --- r: 360585 b: refs/heads/master c: 5071a88475b758bf60191e53606463fe7290c71e h: refs/heads/master i: 360583: 1e73fdca5e8c201d468c0562c6239b7d733ca452 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/ath79_wdt.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index f46ed9bf49ae..b84686985a52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41adafbd7b84c66c2cdad857b75d5d45032310a6 +refs/heads/master: 5071a88475b758bf60191e53606463fe7290c71e diff --git a/trunk/drivers/watchdog/ath79_wdt.c b/trunk/drivers/watchdog/ath79_wdt.c index 38a999e60c0d..dcd18ec1821b 100644 --- a/trunk/drivers/watchdog/ath79_wdt.c +++ b/trunk/drivers/watchdog/ath79_wdt.c @@ -229,13 +229,13 @@ static int ath79_wdt_probe(struct platform_device *pdev) u32 ctrl; int err; - wdt_clk = clk_get(&pdev->dev, "wdt"); + wdt_clk = devm_clk_get(&pdev->dev, "wdt"); if (IS_ERR(wdt_clk)) return PTR_ERR(wdt_clk); err = clk_enable(wdt_clk); if (err) - goto err_clk_put; + return err; wdt_freq = clk_get_rate(wdt_clk); if (!wdt_freq) { @@ -265,8 +265,6 @@ static int ath79_wdt_probe(struct platform_device *pdev) err_clk_disable: clk_disable(wdt_clk); -err_clk_put: - clk_put(wdt_clk); return err; } @@ -274,7 +272,6 @@ static int ath79_wdt_remove(struct platform_device *pdev) { misc_deregister(&ath79_wdt_miscdev); clk_disable(wdt_clk); - clk_put(wdt_clk); return 0; }