Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm: (51 commits)
  [ARM] 5308/1: Fix Viper ISA IRQ handling
  [ARM] 5307/1: pxa: fix CM-X2XX PCMCIA build error
  [ARM] 5306/1: pxa: fix build error on CM-X270
  [ARM] 5302/1: ARM: OMAP: Revert omap3 WDT changes to avoid merge conflict
  [ARM] 5305/1: ARM: OMAP: Fix compile of McBSP by removing unnecessary check
  [ARM] 5301/1: ARM: OMAP: Add missing irq defines
  ARM: OMAP3: Add default kernel config for OMAP LDP
  ARM: OMAP3: Add basic board support for OMAP LDP
  ARM: OMAP3: Defconfig for the Gumstix Overo board (rev 3)
  ARM: OMAP3: Add support for the Gumstix Overo board (rev 3)
  ARM: OMAP3: Add Beagle defconfig
  ARM: OMAP3: Add minimal Beagle board support
  ARM: OMAP3: Add minimal omap3430 support
  ARM: OMAP2: Fix sparse, checkpatch warnings in OMAP2/3 IRQ code
  ARM: OMAP: Fixes to omap_mcbsp_request function
  ARM: OMAP: Add support for OMAP2430 in McBSP
  ARM: OMAP: Add support for McBSP devices 3 - 5 on 34xx
  ARM: OMAP: Allocate McBSP devices dynamically
  Fix sections for omap-mcbsp platform driver
  [ARM] S3C24XX: Additional include moves
  ...

1 files changed, 10 insertions, 2 deletions

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index e7eb7bf9ddec..608038d64f81 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -589,11 +589,16 @@ omap_i2c_probe(struct platform_device *pdev)
 
         dev->dev = &pdev->dev;
         dev->irq = irq->start;
-        dev->base = (void __iomem *) IO_ADDRESS(mem->start);
+        dev->base = ioremap(mem->start, mem->end - mem->start + 1);
+        if (!dev->base) {
+                r = -ENOMEM;
+                goto err_free_mem;
+        }
+
         platform_set_drvdata(pdev, dev);
 
         if ((r = omap_i2c_get_clocks(dev)) != 0)
-                goto err_free_mem;
+                goto err_iounmap;
 
         omap_i2c_unidle(dev);
 
@@ -640,6 +645,8 @@ err_unuse_clocks:
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
         omap_i2c_idle(dev);
         omap_i2c_put_clocks(dev);
+err_iounmap:
+        iounmap(dev->base);
 err_free_mem:
         platform_set_drvdata(pdev, NULL);
         kfree(dev);
@@ -661,6 +668,7 @@ omap_i2c_remove(struct platform_device *pdev)
         i2c_del_adapter(&dev->adapter);
         omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
         omap_i2c_put_clocks(dev);
+        iounmap(dev->base);
         kfree(dev);
         mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         release_mem_region(mem->start, (mem->end - mem->start) + 1);