---

yaml --- r: 353670 b: refs/heads/master c: 5fd9846 h: refs/heads/master v: v3
git-mirror · Jan 22, 2013 · f3c2d26 · f3c2d26
1 parent ca22595
commit f3c2d26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 641d03422a59b1e790b7edabb16bc62da71130c3
+refs/heads/master: 5fd984662cfe1f7c6616992380937a07a918a6a6
diff --git a/trunk/drivers/iio/adc/at91_adc.c b/trunk/drivers/iio/adc/at91_adc.c
@@ -557,9 +557,9 @@ static int at91_adc_probe(struct platform_device *pdev)
 
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 
-	st->reg_base = devm_request_and_ioremap(&pdev->dev, res);
-	if (!st->reg_base) {
-		ret = -ENOMEM;
+	st->reg_base = devm_ioremap_resource(&pdev->dev, res);
+	if (IS_ERR(st->reg_base)) {
+		ret = PTR_ERR(st->reg_base);
 		goto error_free_device;
 	}