From 89de7887556e8e8a7db08928e59a6c8ca62db319 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Wed, 10 Oct 2012 23:23:36 +0300 Subject: [PATCH] --- yaml --- r: 347992 b: refs/heads/master c: ef4817472982b3b6d993e6456cfad58dc848ef70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/watchdog/omap_wdt.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9778abc9e3d1..753763a46cb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f4753d96d30cf4477eafa077ae7f1326a80c1d8 +refs/heads/master: ef4817472982b3b6d993e6456cfad58dc848ef70 diff --git a/trunk/drivers/watchdog/omap_wdt.c b/trunk/drivers/watchdog/omap_wdt.c index 2a6c434cd741..1474c2bd3077 100644 --- a/trunk/drivers/watchdog/omap_wdt.c +++ b/trunk/drivers/watchdog/omap_wdt.c @@ -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; } @@ -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; }