Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 347992
b: refs/heads/master
c: ef48174
h: refs/heads/master
v: v3
  • Loading branch information
Aaro Koskinen authored and Wim Van Sebroeck committed Dec 19, 2012
1 parent 2040eca commit 89de788
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4f4753d96d30cf4477eafa077ae7f1326a80c1d8
refs/heads/master: ef4817472982b3b6d993e6456cfad58dc848ef70
2 changes: 0 additions & 2 deletions trunk/drivers/watchdog/omap_wdt.c
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ static int omap_wdt_probe(struct platform_device *pdev)

err_register:
pm_runtime_disable(wdev->dev);
platform_set_drvdata(pdev, NULL);

return ret;
}
Expand All @@ -304,7 +303,6 @@ static int omap_wdt_remove(struct platform_device *pdev)

pm_runtime_disable(wdev->dev);
watchdog_unregister_device(wdog);
platform_set_drvdata(pdev, NULL);

return 0;
}
Expand Down

0 comments on commit 89de788

Please sign in to comment.