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-stu300.c

diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
index f1912c8..0a6f941 100644 (file)
--- a/drivers/i2c/busses/i2c-stu300.c
+++ b/drivers/i2c/busses/i2c-stu300.c
@@ -888,11 +888,11 @@ stu300_probe(struct platform_device *pdev)
        if (!res)
                return -ENOENT;
 
-       dev->virtbase = devm_request_and_ioremap(&pdev->dev, res);
+       dev->virtbase = devm_ioremap_resource(&pdev->dev, res);
        dev_dbg(&pdev->dev, "initialize bus device I2C%d on virtual "
                "base %p\n", bus_nr, dev->virtbase);
-       if (!dev->virtbase)
-               return -ENOMEM;
+       if (IS_ERR(dev->virtbase))
+               return PTR_ERR(dev->virtbase);
 
        dev->irq = platform_get_irq(pdev, 0);
        ret = devm_request_irq(&pdev->dev, dev->irq, stu300_irh, 0, NAME, dev);