Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 133839
b: refs/heads/master
c: eb5c8bc
h: refs/heads/master
i:
  133837: 13f54a3
  133835: afeb6b0
  133831: 9ad12b3
  133823: 5e4db9f
v: v3
  • Loading branch information
Cesar Eduardo Barros authored and David S. Miller committed Jan 21, 2009
1 parent c11abff commit f477177
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 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: 4101dec9ca64d40f0d673f0a40ba46ba2c60e117
refs/heads/master: eb5c8bc1442a03755ae75d99b59ccea6bbf25a34
10 changes: 9 additions & 1 deletion trunk/drivers/net/sc92031.c
Original file line number Diff line number Diff line change
Expand Up @@ -1423,6 +1423,7 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
struct net_device *dev;
struct sc92031_priv *priv;
u32 mac0, mac1;
unsigned long base_addr;

err = pci_enable_device(pdev);
if (unlikely(err < 0))
Expand Down Expand Up @@ -1497,6 +1498,14 @@ static int __devinit sc92031_probe(struct pci_dev *pdev,
if (err < 0)
goto out_register_netdev;

#if SC92031_USE_BAR == 0
base_addr = dev->mem_start;
#elif SC92031_USE_BAR == 1
base_addr = dev->base_addr;
#endif
printk(KERN_INFO "%s: SC92031 at 0x%lx, %pM, IRQ %d\n", dev->name,
base_addr, dev->dev_addr, dev->irq);

return 0;

out_register_netdev:
Expand Down Expand Up @@ -1603,7 +1612,6 @@ static struct pci_driver sc92031_pci_driver = {

static int __init sc92031_init(void)
{
printk(KERN_INFO SC92031_DESCRIPTION " " SC92031_VERSION "\n");
return pci_register_driver(&sc92031_pci_driver);
}

Expand Down

0 comments on commit f477177

Please sign in to comment.