Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

[~andy/linux] / drivers / ide / tx4938ide.c

diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index ea89fddeed9122fa002f1149ffb0364a7f579100..fd59c0d235b56cc0ce04a06a2298a0d03b4d4bb0 100644 (file)
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -146,7 +146,7 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
                return -ENODEV;
 
        if (!devm_request_mem_region(&pdev->dev, res->start,
-                                    res->end - res->start + 1, "tx4938ide"))
+                                    resource_size(res), "tx4938ide"))
                return -EBUSY;
        mapbase = (unsigned long)devm_ioremap(&pdev->dev, res->start,
                                              8 << pdata->ioport_shift);