projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[cascardo/linux.git]
/
drivers
/
ide
/
ide_platform.c
diff --git
a/drivers/ide/ide_platform.c
b/drivers/ide/ide_platform.c
index
b579fbe
..
42965b3
100644
(file)
--- a/
drivers/ide/ide_platform.c
+++ b/
drivers/ide/ide_platform.c
@@
-81,14
+81,14
@@
static int __devinit plat_ide_probe(struct platform_device *pdev)
if (mmio) {
base = devm_ioremap(&pdev->dev,
if (mmio) {
base = devm_ioremap(&pdev->dev,
- res_base->start, res
_base->end - res_base->start + 1
);
+ res_base->start, res
ource_size(res_base)
);
alt_base = devm_ioremap(&pdev->dev,
alt_base = devm_ioremap(&pdev->dev,
- res_alt->start, res
_alt->end - res_alt->start + 1
);
+ res_alt->start, res
ource_size(res_alt)
);
} else {
base = devm_ioport_map(&pdev->dev,
} else {
base = devm_ioport_map(&pdev->dev,
- res_base->start, res
_base->end - res_base->start + 1
);
+ res_base->start, res
ource_size(res_base)
);
alt_base = devm_ioport_map(&pdev->dev,
alt_base = devm_ioport_map(&pdev->dev,
- res_alt->start, res
_alt->end - res_alt->start + 1
);
+ res_alt->start, res
ource_size(res_alt)
);
}
memset(&hw, 0, sizeof(hw));
}
memset(&hw, 0, sizeof(hw));