---

yaml --- r: 373247 b: refs/heads/master c: 651da3d h: refs/heads/master i: 373245: 20de304 373243: f848eac 373239: fb11e0c 373231: 82760ff 373215: 08d6fa6 373183: b74b188 373119: 5ff3cb2 372991: f9d1bb1 372735: 7fc7431 v: v3
git-mirror · Apr 9, 2013 · 30061d9 · 30061d9
1 parent a43d79a
commit 30061d9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d011c450814eb6b5418c84dd0cac8b6eb99c42dc
+refs/heads/master: 651da3d4026ece555853694f51dbad566f113793
diff --git a/trunk/drivers/mfd/omap-usb-tll.c b/trunk/drivers/mfd/omap-usb-tll.c
@@ -226,12 +226,9 @@ static int usbtll_omap_probe(struct platform_device *pdev)
 	}
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	tll->base = devm_request_and_ioremap(dev, res);
-	if (!tll->base) {
-		ret = -EADDRNOTAVAIL;
-		dev_err(dev, "Resource request/ioremap failed:%d\n", ret);
-		return ret;
-	}
+	tll->base = devm_ioremap_resource(dev, res);
+	if (IS_ERR(tll->base))
+		return PTR_ERR(tll->base);
 
 	platform_set_drvdata(pdev, tll);
 	pm_runtime_enable(dev);