summaryrefslogtreecommitdiffstats
path: root/drivers/watchdog
diff options
context:
space:
mode:
authorLars-Peter Clausen <lars@metafoo.de>2013-05-12 20:04:03 +0200
committerWim Van Sebroeck <wim@iguana.be>2013-07-11 21:12:31 +0200
commit5f314970b25a6960dd056b0038ffc7b88dc2973e (patch)
tree314cdcb9cdea964a8d407573111c1d3c5d959009 /drivers/watchdog
parent6638f4e5e5114fcb0c9dcec05cb3e33454f4a9ac (diff)
downloadblackbird-op-linux-5f314970b25a6960dd056b0038ffc7b88dc2973e.tar.gz
blackbird-op-linux-5f314970b25a6960dd056b0038ffc7b88dc2973e.zip
watchdog: jz4740: Pass device to clk_get
In preparation to switching the jz4740 clk driver to the common clk framework make sure to pass the device to clk_get(). Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
Diffstat (limited to 'drivers/watchdog')
-rw-r--r--drivers/watchdog/jz4740_wdt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/watchdog/jz4740_wdt.c b/drivers/watchdog/jz4740_wdt.c
index 1cb25f69a96d..d1afdf684c18 100644
--- a/drivers/watchdog/jz4740_wdt.c
+++ b/drivers/watchdog/jz4740_wdt.c
@@ -177,7 +177,7 @@ static int jz4740_wdt_probe(struct platform_device *pdev)
goto err_out;
}
- drvdata->rtc_clk = clk_get(NULL, "rtc");
+ drvdata->rtc_clk = clk_get(&pdev->dev, "rtc");
if (IS_ERR(drvdata->rtc_clk)) {
dev_err(&pdev->dev, "cannot find RTC clock\n");
ret = PTR_ERR(drvdata->rtc_clk);
OpenPOWER on IntegriCloud