git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/fbdev...
[pandora-kernel.git]
/
drivers
/
video
/
msm
/
mdp.c
diff --git
a/drivers/video/msm/mdp.c
b/drivers/video/msm/mdp.c
index
7e94ee3
..
01fa660
100644
(file)
--- a/
drivers/video/msm/mdp.c
+++ b/
drivers/video/msm/mdp.c
@@
-406,8
+406,7
@@
int mdp_probe(struct platform_device *pdev)
goto error_get_irq;
}
goto error_get_irq;
}
- mdp->base = ioremap(resource->start,
- resource->end - resource->start);
+ mdp->base = ioremap(resource->start, resource_size(resource));
if (mdp->base == 0) {
printk(KERN_ERR "msmfb: cannot allocate mdp regs!\n");
ret = -ENOMEM;
if (mdp->base == 0) {
printk(KERN_ERR "msmfb: cannot allocate mdp regs!\n");
ret = -ENOMEM;