Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 158738
b: refs/heads/master
c: 6f5bec1
h: refs/heads/master
v: v3
  • Loading branch information
Michael Opdenacker authored and David S. Miller committed Jul 6, 2009
1 parent 56e0c04 commit a9e0b45
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6ed106549d17474ca17a16057f4c0ed4eba5a7ca
refs/heads/master: 6f5bec195839dba3ca0ab8a7a53861e679109c0b
4 changes: 2 additions & 2 deletions trunk/drivers/net/r6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down

0 comments on commit a9e0b45

Please sign in to comment.