diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-03 15:51:21 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-03 15:51:21 -0500 |
| commit | a6c872afb2536f47285e6643f4629dec7520041d (patch) | |
| tree | 4b54e69fc6594f9afc1277520a350db04e578e77 /arch/arm/mach-omap2/mailbox.c | |
| parent | 9fe02668fe48a1d546196bc1392330ff28d9bd57 (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-omap2/mailbox.c')
| -rw-r--r-- | arch/arm/mach-omap2/mailbox.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c index c035ad3426d0..ef57b38a56a4 100644 --- a/arch/arm/mach-omap2/mailbox.c +++ b/arch/arm/mach-omap2/mailbox.c | |||
| @@ -300,7 +300,7 @@ static int __devinit omap2_mbox_probe(struct platform_device *pdev) | |||
| 300 | dev_err(&pdev->dev, "invalid mem resource\n"); | 300 | dev_err(&pdev->dev, "invalid mem resource\n"); |
| 301 | return -ENODEV; | 301 | return -ENODEV; |
| 302 | } | 302 | } |
| 303 | mbox_base = ioremap(res->start, res->end - res->start); | 303 | mbox_base = ioremap(res->start, resource_size(res)); |
| 304 | if (!mbox_base) | 304 | if (!mbox_base) |
| 305 | return -ENOMEM; | 305 | return -ENOMEM; |
| 306 | 306 | ||