summaryrefslogtreecommitdiffstats
path: root/drivers/block/mg_disk.c
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-22 08:55:25 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-22 08:55:25 +0100
commit7755726fe90a8b253659756e6de68c1a55aa427f (patch)
treea3523fa77e07854db3b8089e3066a55ea997060c /drivers/block/mg_disk.c
parentInput: sh_keysc - add mode 4 and mode 5 support (diff)
parentLinux 2.6.33-rc5 (diff)
downloadlinux-7755726fe90a8b253659756e6de68c1a55aa427f.tar.xz
linux-7755726fe90a8b253659756e6de68c1a55aa427f.zip
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'drivers/block/mg_disk.c')
-rw-r--r--drivers/block/mg_disk.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c
index e0339aaa1815..02b2583df7fc 100644
--- a/drivers/block/mg_disk.c
+++ b/drivers/block/mg_disk.c
@@ -860,7 +860,7 @@ static int mg_probe(struct platform_device *plat_dev)
err = -EINVAL;
goto probe_err_2;
}
- host->dev_base = ioremap(rsc->start , rsc->end + 1);
+ host->dev_base = ioremap(rsc->start, resource_size(rsc));
if (!host->dev_base) {
printk(KERN_ERR "%s:%d ioremap fail\n",
__func__, __LINE__);