diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-28 11:25:46 -0400 |
| commit | 6124a4e430b64d1577438c8648c59e996d02e73e (patch) | |
| tree | 49cfafad785d1c9e403a5b0d755298b9af2c260f /arch/arm/plat-s5p/sysmmu.c | |
| parent | 8e267f3da5f117d2f1316cf6ddf740f93f1c73aa (diff) | |
| parent | 580975d7f48d7d047e22bb0f42adf7557801d8d4 (diff) | |
Merge branch 'imx/dt' into next/dt
Diffstat (limited to 'arch/arm/plat-s5p/sysmmu.c')
| -rw-r--r-- | arch/arm/plat-s5p/sysmmu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/plat-s5p/sysmmu.c b/arch/arm/plat-s5p/sysmmu.c index 54f5eddc921d..e1cbc728c775 100644 --- a/arch/arm/plat-s5p/sysmmu.c +++ b/arch/arm/plat-s5p/sysmmu.c | |||
| @@ -232,8 +232,8 @@ static int s5p_sysmmu_probe(struct platform_device *pdev) | |||
| 232 | goto err_res; | 232 | goto err_res; |
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | mem = request_mem_region(res->start, | 235 | mem = request_mem_region(res->start, resource_size(res), |
| 236 | ((res->end) - (res->start)) + 1, pdev->name); | 236 | pdev->name); |
| 237 | if (!mem) { | 237 | if (!mem) { |
| 238 | dev_err(dev, "Failed to request the memory region of %s.\n", | 238 | dev_err(dev, "Failed to request the memory region of %s.\n", |
| 239 | sysmmu_ips_name[i]); | 239 | sysmmu_ips_name[i]); |
| @@ -241,7 +241,7 @@ static int s5p_sysmmu_probe(struct platform_device *pdev) | |||
| 241 | goto err_res; | 241 | goto err_res; |
| 242 | } | 242 | } |
| 243 | 243 | ||
| 244 | sysmmusfrs[i] = ioremap(res->start, res->end - res->start + 1); | 244 | sysmmusfrs[i] = ioremap(res->start, resource_size(res)); |
| 245 | if (!sysmmusfrs[i]) { | 245 | if (!sysmmusfrs[i]) { |
| 246 | dev_err(dev, "Failed to ioremap() for %s.\n", | 246 | dev_err(dev, "Failed to ioremap() for %s.\n", |
| 247 | sysmmu_ips_name[i]); | 247 | sysmmu_ips_name[i]); |