git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i915fb' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/intelf...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
orinoco_nortel.c
diff --git
a/drivers/net/wireless/orinoco_nortel.c
b/drivers/net/wireless/orinoco_nortel.c
index
1596182
..
74b9d5b
100644
(file)
--- a/
drivers/net/wireless/orinoco_nortel.c
+++ b/
drivers/net/wireless/orinoco_nortel.c
@@
-206,7
+206,6
@@
static int orinoco_nortel_init_one(struct pci_dev *pdev,
err = -EBUSY;
goto fail_irq;
}
err = -EBUSY;
goto fail_irq;
}
- orinoco_pci_setup_netdev(dev, pdev, 2);
err = orinoco_nortel_hw_init(card);
if (err) {
err = orinoco_nortel_hw_init(card);
if (err) {
@@
-227,6
+226,8
@@
static int orinoco_nortel_init_one(struct pci_dev *pdev,
}
pci_set_drvdata(pdev, dev);
}
pci_set_drvdata(pdev, dev);
+ printk(KERN_DEBUG "%s: " DRIVER_NAME " at %s\n", dev->name,
+ pci_name(pdev));
return 0;
return 0;
@@
-265,7
+266,7
@@
static void __devexit orinoco_nortel_remove_one(struct pci_dev *pdev)
iowrite16(0, card->bridge_io + 10);
unregister_netdev(dev);
iowrite16(0, card->bridge_io + 10);
unregister_netdev(dev);
- free_irq(dev->irq, dev);
+ free_irq(
p
dev->irq, dev);
pci_set_drvdata(pdev, NULL);
free_orinocodev(dev);
pci_iounmap(pdev, priv->hw.iobase);
pci_set_drvdata(pdev, NULL);
free_orinocodev(dev);
pci_iounmap(pdev, priv->hw.iobase);