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

[profile/ivi/kernel-x86-ivi.git] / drivers / i2c / busses / i2c-s3c2410.c

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index 5e33df7..f6b880b 100644 (file)
--- a/drivers/i2c/busses/i2c-s3c2410.c
+++ b/drivers/i2c/busses/i2c-s3c2410.c
@@ -1041,12 +1041,10 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
                return -ENOENT;
        }
 
-       i2c->regs = devm_request_and_ioremap(&pdev->dev, res);
+       i2c->regs = devm_ioremap_resource(&pdev->dev, res);
 
-       if (i2c->regs == NULL) {
-               dev_err(&pdev->dev, "cannot request and map IO\n");
-               return -ENXIO;
-       }
+       if (IS_ERR(i2c->regs))
+               return PTR_ERR(i2c->regs);
 
        dev_dbg(&pdev->dev, "registers %p (%p)\n",
                i2c->regs, res);