Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / iio / adc / exynos_adc.c

diff --git a/drivers/iio/adc/exynos_adc.c b/drivers/iio/adc/exynos_adc.c
index b3d03d335948a5a5757bd4d49650b1685cbfb78b..9809fc9a35d2f09b28a9b0b1e1839f7a3e5df1aa 100644 (file)
--- a/drivers/iio/adc/exynos_adc.c
+++ b/drivers/iio/adc/exynos_adc.c
@@ -270,16 +270,16 @@ static int exynos_adc_probe(struct platform_device *pdev)
        info = iio_priv(indio_dev);
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       info->regs = devm_request_and_ioremap(&pdev->dev, mem);
-       if (!info->regs) {
-               ret = -ENOMEM;
+       info->regs = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(info->regs)) {
+               ret = PTR_ERR(info->regs);
                goto err_iio;
        }
 
        mem = platform_get_resource(pdev, IORESOURCE_MEM, 1);
-       info->enable_reg = devm_request_and_ioremap(&pdev->dev, mem);
-       if (!info->enable_reg) {
-               ret = -ENOMEM;
+       info->enable_reg = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(info->enable_reg)) {
+               ret = PTR_ERR(info->enable_reg);
                goto err_iio;
        }