aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/orinoco/airport.c
diff options
context:
space:
mode:
authorDavid Kilroy <kilroyd@googlemail.com>2009-06-18 18:21:24 -0400
committerJohn W. Linville <linville@tuxdriver.com>2009-07-10 15:01:44 -0400
commit8e638267a896e171e49fb9013f5baf96a4ede754 (patch)
tree6bf1dfb8ef9388037b122478c1c649de5c8a5071 /drivers/net/wireless/orinoco/airport.c
parenta2608362b22ade22ef5472a8c9b82687d86f976f (diff)
orinoco: initialise independently of netdev
Initialise the orinoco driver before registerring with netdev, which will help when we get to cfg80211... Signed-off-by: David Kilroy <kilroyd@googlemail.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/orinoco/airport.c')
-rw-r--r--drivers/net/wireless/orinoco/airport.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/net/wireless/orinoco/airport.c b/drivers/net/wireless/orinoco/airport.c
index 6559aee09e3b..9f90337344f1 100644
--- a/drivers/net/wireless/orinoco/airport.c
+++ b/drivers/net/wireless/orinoco/airport.c
@@ -234,6 +234,12 @@ airport_attach(struct macio_dev *mdev, const struct of_device_id *match)
234 } 234 }
235 card->irq_requested = 1; 235 card->irq_requested = 1;
236 236
237 /* Initialise the main driver */
238 if (orinoco_init(priv) != 0) {
239 printk(KERN_ERR PFX "orinoco_init() failed\n");
240 goto failed;
241 }
242
237 /* Tell the stack we exist */ 243 /* Tell the stack we exist */
238 if (register_netdev(dev) != 0) { 244 if (register_netdev(dev) != 0) {
239 printk(KERN_ERR PFX "register_netdev() failed\n"); 245 printk(KERN_ERR PFX "register_netdev() failed\n");