Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 57634
b: refs/heads/master
c: 32a74b7
h: refs/heads/master
v: v3
  • Loading branch information
Holger Schurig authored and John W. Linville committed Jun 11, 2007
1 parent 98c5198 commit c168d73
Show file tree
Hide file tree
Showing 4 changed files with 25 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: 3874d0fefd965eedfc7f8e0a5459ddf914eb4306
refs/heads/master: 32a74b7c8f7b883b532e0e4333b7c3014d3d8fe8
1 change: 1 addition & 0 deletions trunk/drivers/net/wireless/libertas/decl.h
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ void libertas_send_iwevcustom_event(wlan_private * priv, s8 * str);
extern struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band,
int *cfp_no);
wlan_private *wlan_add_card(void *card);
int libertas_activate_card(wlan_private *priv);
int wlan_remove_card(wlan_private *priv);
int wlan_add_mesh(wlan_private *priv);
void wlan_remove_mesh(wlan_private *priv);
Expand Down
3 changes: 3 additions & 0 deletions trunk/drivers/net/wireless/libertas/if_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ static int if_usb_probe(struct usb_interface *intf,
if (!(priv = wlan_add_card(usb_cardp)))
goto dealloc;

if (libertas_activate_card(priv))
goto dealloc;

if (libertas_found < MAX_DEVS) {
libertas_devs[libertas_found] = priv->wlan_dev.netdev;
libertas_found++;
Expand Down
26 changes: 20 additions & 6 deletions trunk/drivers/net/wireless/libertas/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -812,6 +812,21 @@ wlan_private *wlan_add_card(void *card)
spin_lock_init(&priv->adapter->driver_lock);
init_waitqueue_head(&priv->adapter->cmd_pending);
priv->adapter->nr_cmd_pending = 0;
goto done;

err_kzalloc:
free_netdev(dev);
done:
lbs_deb_leave_args(LBS_DEB_NET, "priv %p", priv);
return priv;
}

int libertas_activate_card(wlan_private *priv)
{
struct net_device *dev = priv->wlan_dev.netdev;
int ret = -1;

lbs_deb_enter(LBS_DEB_MAIN);

lbs_deb_thread("Starting kthread...\n");
priv->mainthread.priv = priv;
Expand Down Expand Up @@ -847,8 +862,8 @@ wlan_private *wlan_add_card(void *card)

libertas_debugfs_init_one(priv, dev);

lbs_deb_leave_args(LBS_DEB_NET, "priv %p", priv);
return priv;
ret = 0;
goto done;

err_init_fw:
libertas_sbi_unregister_dev(priv);
Expand All @@ -858,11 +873,10 @@ wlan_private *wlan_add_card(void *card)
wake_up_interruptible(&priv->mainthread.waitq);
wlan_terminate_thread(&priv->mainthread);
kfree(priv->adapter);
err_kzalloc:
free_netdev(dev);

lbs_deb_leave_args(LBS_DEB_NET, "priv NULL");
return NULL;
done:
lbs_deb_leave_args(LBS_DEB_NET, "ret %d", ret);
return ret;
}

/**
Expand Down

0 comments on commit c168d73

Please sign in to comment.