From f3c2d26d0e47e578cdff810e277c70f080edf0ea Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Mon, 21 Jan 2013 11:09:04 +0100 Subject: [PATCH] --- yaml --- r: 353670 b: refs/heads/master c: 5fd984662cfe1f7c6616992380937a07a918a6a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/iio/adc/at91_adc.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5ffcc7bc1dc5..2b3ec1f202c9 100644 --- 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 index a526c0e3aaa8..83c836ba600f 100644 --- 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; }