Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 214597
b: refs/heads/master
c: d9fd1b2
h: refs/heads/master
i:
  214595: d7f8d90
v: v3
  • Loading branch information
Meelis Roos authored and David S. Miller committed Sep 22, 2010
1 parent b7395ff commit bf1805e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 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: 73da16c28ed0724755afdb95c7dd6b166381be10
refs/heads/master: d9fd1b2857154f1ac32ca041641ba947525ff7fa
10 changes: 4 additions & 6 deletions trunk/drivers/net/tokenring/tmspci.c
Original file line number Diff line number Diff line change
Expand Up @@ -125,18 +125,16 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
dev->irq = pci_irq_line;
dev->dma = 0;

printk("%s: %s\n", dev->name, cardinfo->name);
printk("%s: IO: %#4lx IRQ: %d\n",
dev->name, dev->base_addr, dev->irq);
dev_info(&pdev->dev, "%s\n", cardinfo->name);
dev_info(&pdev->dev, " IO: %#4lx IRQ: %d\n", dev->base_addr, dev->irq);

tms_pci_read_eeprom(dev);

printk("%s: Ring Station Address: %pM\n",
dev->name, dev->dev_addr);
dev_info(&pdev->dev, " Ring Station Address: %pM\n", dev->dev_addr);

ret = tmsdev_init(dev, &pdev->dev);
if (ret) {
printk("%s: unable to get memory for dev->priv.\n", dev->name);
dev_info(&pdev->dev, "unable to get memory for dev->priv.\n");
goto err_out_region;
}

Expand Down

0 comments on commit bf1805e

Please sign in to comment.