---

yaml --- r: 364797 b: refs/heads/master c: f4362b1 h: refs/heads/master i: 364795: 43bcfb4 v: v3
git-mirror · Apr 3, 2013 · 244fd6c · 244fd6c
1 parent 00c03a5
commit 244fd6c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 50757b24944ede7ab07165cdb57c995456b6e916
+refs/heads/master: f4362b1dd7262e3c81f295154b601065f8810186
diff --git a/trunk/drivers/usb/phy/phy-samsung-usb3.c b/trunk/drivers/usb/phy/phy-samsung-usb3.c
@@ -244,11 +244,9 @@ static int samsung_usb3phy_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	phy_base = devm_request_and_ioremap(dev, phy_mem);
-	if (!phy_base) {
-		dev_err(dev, "%s: register mapping failed\n", __func__);
-		return -ENXIO;
-	}
+	phy_base = devm_ioremap_resource(dev, phy_mem);
+	if (IS_ERR(phy_base))
+		return PTR_ERR(phy_base);
 
 	sphy = devm_kzalloc(dev, sizeof(*sphy), GFP_KERNEL);
 	if (!sphy)