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

diff --git a/drivers/i2c/busses/i2c-at91.c b/drivers/i2c/busses/i2c-at91.c
index 3e4ad68..75195e3 100644 (file)
--- a/drivers/i2c/busses/i2c-at91.c
+++ b/drivers/i2c/busses/i2c-at91.c
@@ -726,9 +726,9 @@ static int at91_twi_probe(struct platform_device *pdev)
        if (!dev->pdata)
                return -ENODEV;
 
-       dev->base = devm_request_and_ioremap(&pdev->dev, mem);
-       if (!dev->base)
-               return -EBUSY;
+       dev->base = devm_ioremap_resource(&pdev->dev, mem);
+       if (IS_ERR(dev->base))
+               return PTR_ERR(dev->base);
 
        dev->irq = platform_get_irq(pdev, 0);
        if (dev->irq < 0)