diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 04:26:42 (GMT) |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 04:26:42 (GMT) |
commit | 65795efbd380a832ae508b04dba8f8e53f0b84d9 (patch) | |
tree | a30261796868545d6b29ff062332433b460c3e2e /drivers/i2c/busses/i2c-omap.c | |
parent | 8d15b0ec32f20a57881dc073b2e8d11dea0ccceb (diff) | |
parent | 4eaad8ad296a78689f148c8dcd383fc4e51ee123 (diff) | |
download | linux-65795efbd380a832ae508b04dba8f8e53f0b84d9.tar.xz |
Merge branch 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux
* 'next-i2c' of git://aeryn.fluff.org.uk/bjdooks/linux:
i2c-stu300: Make driver depend on MACH_U300
i2c-s3c2410: use resource_size()
i2c: Use resource_size macro
i2c: ST DDC I2C U300 bus driver v3
i2c-bfin-twi: pull in io.h for ioremap()
Diffstat (limited to 'drivers/i2c/busses/i2c-omap.c')
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index c73475d..b606db8 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c @@ -828,7 +828,7 @@ omap_i2c_probe(struct platform_device *pdev) dev->idle = 1; dev->dev = &pdev->dev; dev->irq = irq->start; - dev->base = ioremap(mem->start, mem->end - mem->start + 1); + dev->base = ioremap(mem->start, resource_size(mem)); if (!dev->base) { r = -ENOMEM; goto err_free_mem; |