---

yaml --- r: 286917 b: refs/heads/master c: 52ea9a7 h: refs/heads/master i: 286915: a18bbdc v: v3
git-mirror · Jan 27, 2012 · b8bd8d5 · b8bd8d5
1 parent 7d238df
commit b8bd8d5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5d32d4868ad87a5be8571b22b3d732576504dfb0
+refs/heads/master: 52ea9a7d7946c03aa1f9eeb71adb0191402724dd
diff --git a/trunk/drivers/watchdog/dw_wdt.c b/trunk/drivers/watchdog/dw_wdt.c
@@ -300,11 +300,7 @@ static int __devinit dw_wdt_drv_probe(struct platform_device *pdev)
 	if (!mem)
 		return -EINVAL;
 
-	if (!devm_request_mem_region(&pdev->dev, mem->start, resource_size(mem),
-				     "dw_wdt"))
-		return -ENOMEM;
-
-	dw_wdt.regs = devm_ioremap(&pdev->dev, mem->start, resource_size(mem));
+	dw_wdt.regs = devm_request_and_ioremap(&pdev->dev, mem);
 	if (!dw_wdt.regs)
 		return -ENOMEM;