aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorSergei Shtylyov <sshtylyov@ru.mvista.com>2008-04-16 19:14:33 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-04-16 19:14:33 -0400
commitb4dcaea36b0376456c97698deba0089d2d67cbe7 (patch)
tree9dd0a07edf2f15b2a8caeade081915e9f770f256 /drivers/ide
parentfabd3a223a96de1a91b2148655f2ed09ca9d1c20 (diff)
Pb1200/DBAu1200: fix bad IDE resource size
The header files for the Pb1200/DBAu1200 boards have wrong definition for the IDE interface's decoded range length -- it should be 512 bytes according to what the IDE driver does. In addition, the IDE platform device claims 1 byte too many for its memory resource -- fix the platform code and the IDE driver in accordance. Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Cc: Ralf Baechle <ralf@linux-mips.org> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/mips/au1xxx-ide.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index f84411b6609a..85c016bdfd38 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -586,13 +586,14 @@ static int au_ide_probe(struct device *dev)
586 goto out; 586 goto out;
587 } 587 }
588 588
589 if (!request_mem_region (res->start, res->end-res->start, pdev->name)) { 589 if (!request_mem_region(res->start, res->end - res->start + 1,
590 pdev->name)) {
590 pr_debug("%s: request_mem_region failed\n", DRV_NAME); 591 pr_debug("%s: request_mem_region failed\n", DRV_NAME);
591 ret = -EBUSY; 592 ret = -EBUSY;
592 goto out; 593 goto out;
593 } 594 }
594 595
595 ahwif->regbase = (u32)ioremap(res->start, res->end-res->start); 596 ahwif->regbase = (u32)ioremap(res->start, res->end - res->start + 1);
596 if (ahwif->regbase == 0) { 597 if (ahwif->regbase == 0) {
597 ret = -ENOMEM; 598 ret = -ENOMEM;
598 goto out; 599 goto out;
@@ -677,7 +678,7 @@ static int au_ide_remove(struct device *dev)
677 iounmap((void *)ahwif->regbase); 678 iounmap((void *)ahwif->regbase);
678 679
679 res = platform_get_resource(pdev, IORESOURCE_MEM, 0); 680 res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
680 release_mem_region(res->start, res->end - res->start); 681 release_mem_region(res->start, res->end - res->start + 1);
681 682
682 return 0; 683 return 0;
683} 684}