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/airport.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/airport.c')
-rw-r--r-- | drivers/net/wireless/airport.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/airport.c b/drivers/net/wireless/airport.c index 6f7eb9f59223..ce03a2e865fa 100644 --- a/drivers/net/wireless/airport.c +++ b/drivers/net/wireless/airport.c | |||
@@ -180,7 +180,8 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match) | |||
180 | } | 180 | } |
181 | 181 | ||
182 | /* Allocate space for private device-specific data */ | 182 | /* Allocate space for private device-specific data */ |
183 | dev = alloc_orinocodev(sizeof(*card), airport_hard_reset); | 183 | dev = alloc_orinocodev(sizeof(*card), &mdev->ofdev.dev, |
184 | airport_hard_reset, NULL); | ||
184 | if (! dev) { | 185 | if (! dev) { |
185 | printk(KERN_ERR PFX "Cannot allocate network device\n"); | 186 | printk(KERN_ERR PFX "Cannot allocate network device\n"); |
186 | return -ENODEV; | 187 | return -ENODEV; |