Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa...

[karo-tx-linux.git] / drivers / i2c / busses / i2c-rcar.c

diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
index 9bd4d73d29e3593fb86ad2bfb47161bafa68a192..4ba4a95b6b2607eda712fa1dcbfea6b4cab3751a 100644 (file)
--- a/drivers/i2c/busses/i2c-rcar.c
+++ b/drivers/i2c/busses/i2c-rcar.c
@@ -642,11 +642,9 @@ static int rcar_i2c_probe(struct platform_device *pdev)
        if (ret < 0)
                return ret;
 
-       priv->io = devm_request_and_ioremap(dev, res);
-       if (!priv->io) {
-               dev_err(dev, "cannot ioremap\n");
-               return -ENODEV;
-       }
+       priv->io = devm_ioremap_resource(dev, res);
+       if (IS_ERR(priv->io))
+               return PTR_ERR(priv->io);
 
        priv->irq = platform_get_irq(pdev, 0);
        init_waitqueue_head(&priv->wait);