---

yaml --- r: 353673 b: refs/heads/master c: 1684789 h: refs/heads/master i: 353671: 2ff6e91 v: v3
git-mirror · Jan 22, 2013 · 12dedfe · 12dedfe
1 parent e012b3f
commit 12dedfe
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: 06303c2e00701724acb95069ca46f87c998c4be1
+refs/heads/master: 1684789f86cbd6a1aff82970992c711898b19995
diff --git a/trunk/drivers/misc/atmel-ssc.c b/trunk/drivers/misc/atmel-ssc.c
@@ -159,11 +159,9 @@ static int ssc_probe(struct platform_device *pdev)
 		return -ENXIO;
 	}
 
-	ssc->regs = devm_request_and_ioremap(&pdev->dev, regs);
-	if (!ssc->regs) {
-		dev_dbg(&pdev->dev, "ioremap failed\n");
-		return -EINVAL;
-	}
+	ssc->regs = devm_ioremap_resource(&pdev->dev, regs);
+	if (IS_ERR(ssc->regs))
+		return PTR_ERR(ssc->regs);
 
 	ssc->phybase = regs->start;