From 9d71cea220e8e416a3a9df1abff74d913bca7800 Mon Sep 17 00:00:00 2001 From: Mrugesh Katepallewar Date: Wed, 6 Feb 2013 16:56:01 +0530 Subject: [PATCH] --- yaml --- r: 360607 b: refs/heads/master c: 362ce5aeeb1b1828f91c2ca07327f72c24183ec9 h: refs/heads/master i: 360605: 72f7eb4479ee2c9611715686e9c6b63e44d43201 360603: 20dac06584da4e00e947f57950155fe6000bdca7 360599: aae117a305e66219c9b1efc23450a0984eec9f0e 360591: f59636e835520baa7ee314939a5ccebf1705dc27 360575: fb23d2e6213df12fca23f6a1004312852a4b8ff6 v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/davinci_wdt.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 740febc2f898..895faa8deb3f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a6a1bcd3700a792d89999a7ec89a9303534ccefc +refs/heads/master: 362ce5aeeb1b1828f91c2ca07327f72c24183ec9 diff --git a/trunk/drivers/watchdog/davinci_wdt.c b/trunk/drivers/watchdog/davinci_wdt.c index e8e87246ea6d..c3c2f8205ef1 100644 --- a/trunk/drivers/watchdog/davinci_wdt.c +++ b/trunk/drivers/watchdog/davinci_wdt.c @@ -204,7 +204,7 @@ static int davinci_wdt_probe(struct platform_device *pdev) int ret = 0, size; struct device *dev = &pdev->dev; - wdt_clk = clk_get(dev, NULL); + wdt_clk = devm_clk_get(dev, NULL); if (WARN_ON(IS_ERR(wdt_clk))) return PTR_ERR(wdt_clk); @@ -257,7 +257,6 @@ static int davinci_wdt_remove(struct platform_device *pdev) } clk_disable_unprepare(wdt_clk); - clk_put(wdt_clk); return 0; }