FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-08 18:42:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'v4.17-rc1'

Browse Source
This commit is contained in:
Wim Van Sebroeck 2018-03-26 20:48:27 +02:00
commit 1991a55dc8
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/watchdog/davinci_wdt.c
View File

@ -236,15 +236,22 @@ static int davinci_wdt_probe(struct platform_device *pdev)
wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); wdt_mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
davinci_wdt->base = devm_ioremap_resource(dev, wdt_mem); davinci_wdt->base = devm_ioremap_resource(dev, wdt_mem);
if (IS_ERR(davinci_wdt->base)) if (IS_ERR(davinci_wdt->base)) {
return PTR_ERR(davinci_wdt->base); ret = PTR_ERR(davinci_wdt->base);
goto err_clk_disable;
}
ret = watchdog_register_device(wdd); ret = watchdog_register_device(wdd);
if (ret < 0) { if (ret) {
clk_disable_unprepare(davinci_wdt->clk);
dev_err(dev, "cannot register watchdog device\n"); dev_err(dev, "cannot register watchdog device\n");
goto err_clk_disable;
} }
return 0;
err_clk_disable:
clk_disable_unprepare(davinci_wdt->clk);
return ret; return ret;
} }