---

yaml --- r: 181176 b: refs/heads/master c: 3b0be1a h: refs/heads/master v: v3
git-mirror · Feb 5, 2010 · ad09cd3 · ad09cd3
1 parent fb5e89e
commit ad09cd3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e04221029067cbaff3fc8f4daf991532afbcbaf
+refs/heads/master: 3b0be1a4f2f7d8280574aa6e5eac2dd3dd57e2b7
diff --git a/trunk/arch/sh/drivers/pci/pci-sh7780.c b/trunk/arch/sh/drivers/pci/pci-sh7780.c
@@ -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,
@@ -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))
@@ -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));
 	}
 
 	/*