Skip to content

Commit

Permalink
sh: Fix an off-by-1 in SH7780 PCIC memory resource mapping.
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Paul Mundt committed Feb 5, 2010
1 parent 8e04221 commit 3b0be1a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/sh/drivers/pci/pci-sh7780.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

static struct resource sh7785_pci_resources[] = {
{
.name = "SH7785_IO",
.name = "PCI IO",
.start = 0x1000,
.end = SZ_4M - 1,
.flags = IORESOURCE_IO,
Expand Down Expand Up @@ -338,8 +338,8 @@ static int __init sh7780_pci_init(void)
/*
* Setup the memory BARs
*/
for (i = 0; i < chan->nr_resources; i++) {
struct resource *res = chan->resources + (i + 1);
for (i = 1; i < chan->nr_resources; i++) {
struct resource *res = chan->resources + i;
resource_size_t size;

if (unlikely(res->flags & IORESOURCE_IO))
Expand All @@ -361,8 +361,8 @@ static int __init sh7780_pci_init(void)
* keeps things pretty simple.
*/
__raw_writel(((roundup_pow_of_two(size) / SZ_256K) - 1) << 18,
chan->reg_base + SH7780_PCIMBMR(i));
__raw_writel(res->start, chan->reg_base + SH7780_PCIMBR(i));
chan->reg_base + SH7780_PCIMBMR(i - 1));
__raw_writel(res->start, chan->reg_base + SH7780_PCIMBR(i - 1));
}

/*
Expand Down

0 comments on commit 3b0be1a

Please sign in to comment.