From a9e0b45aaa4c267377b7efd686ad7753c909fac1 Mon Sep 17 00:00:00 2001
From: Michael Opdenacker <michael@free-electrons.com>
Date: Wed, 24 Jun 2009 21:05:09 +0000
Subject: [PATCH] --- yaml --- r: 158738 b: refs/heads/master c:
 6f5bec195839dba3ca0ab8a7a53861e679109c0b h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/r6040.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 24ef78fd3b72..b6a4952f372b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6ed106549d17474ca17a16057f4c0ed4eba5a7ca
+refs/heads/master: 6f5bec195839dba3ca0ab8a7a53861e679109c0b
diff --git a/trunk/drivers/net/r6040.c b/trunk/drivers/net/r6040.c
index ed63d23a6452..b3197e96f323 100644
--- a/trunk/drivers/net/r6040.c
+++ b/trunk/drivers/net/r6040.c
@@ -1112,13 +1112,13 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 	}
 
 	/* IO Size check */
-	if (pci_resource_len(pdev, 0) < io_size) {
+	if (pci_resource_len(pdev, bar) < io_size) {
 		printk(KERN_ERR DRV_NAME ": Insufficient PCI resources, aborting\n");
 		err = -EIO;
 		goto err_out;
 	}
 
-	pioaddr = pci_resource_start(pdev, 0);	/* IO map base address */
+	pioaddr = pci_resource_start(pdev, bar);	/* IO map base address */
 	pci_set_master(pdev);
 
 	dev = alloc_etherdev(sizeof(struct r6040_private));