diff options
author | David Kilroy <kilroyd@gmail.com> | 2008-08-21 18:27:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-08-22 19:28:05 -0400 |
commit | 3994d502017a2239e30152d1231843ad05d04a7b (patch) | |
tree | c4f15d1b95783d035d954173167ff08e65665461 /drivers/net/wireless/orinoco_pci.c | |
parent | 8f5ae73c5366128d3800cf9765507422bcf1ef96 (diff) |
orinoco: Invoke firmware download in main driver
Firmware download is enabled for Agere in orinoco_cs. Symbol firmware
download has been moved out of spectrum_cs into orinoco_cs. Firmware
download is not enabled for Intersil.
Symbol based firmware is restricted to only download on spectrum_cs
based cards.
The firmware names are hardcoded for each firmware type.
Signed-off-by: David Kilroy <kilroyd@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco_pci.c')
-rw-r--r-- | drivers/net/wireless/orinoco_pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/orinoco_pci.c b/drivers/net/wireless/orinoco_pci.c index 2547d5dac0d3..4ebd638a073e 100644 --- a/drivers/net/wireless/orinoco_pci.c +++ b/drivers/net/wireless/orinoco_pci.c | |||
@@ -139,7 +139,8 @@ static int orinoco_pci_init_one(struct pci_dev *pdev, | |||
139 | } | 139 | } |
140 | 140 | ||
141 | /* Allocate network device */ | 141 | /* Allocate network device */ |
142 | dev = alloc_orinocodev(sizeof(*card), orinoco_pci_cor_reset); | 142 | dev = alloc_orinocodev(sizeof(*card), &pdev->dev, |
143 | orinoco_pci_cor_reset, NULL); | ||
143 | if (!dev) { | 144 | if (!dev) { |
144 | printk(KERN_ERR PFX "Cannot allocate network device\n"); | 145 | printk(KERN_ERR PFX "Cannot allocate network device\n"); |
145 | err = -ENOMEM; | 146 | err = -ENOMEM; |