diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-06 17:02:22 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-06 17:02:22 +0200 |
| commit | a2413598b8c5f14d75f914ce95d72bacdeabd05e (patch) | |
| tree | 35e1340b05b295dbefefaa45424e00a55c28402e /drivers/net/wireless/ipw2100.c | |
| parent | [PATCH] forcedeth: decouple vlan and rx checksum dependency (diff) | |
| parent | [PATCH] bcm43xx: Set floor of wireless signal and noise at -110 dBm (diff) | |
| download | linux-a2413598b8c5f14d75f914ce95d72bacdeabd05e.tar.xz linux-a2413598b8c5f14d75f914ce95d72bacdeabd05e.zip | |
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'drivers/net/wireless/ipw2100.c')
| -rw-r--r-- | drivers/net/wireless/ipw2100.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c index 5f8ccf48061a..d2db8eb412c1 100644 --- a/drivers/net/wireless/ipw2100.c +++ b/drivers/net/wireless/ipw2100.c @@ -6254,13 +6254,14 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, * member to call a function that then just turns and calls ipw2100_up. * net_dev->init is called after name allocation but before the * notifier chain is called */ - mutex_lock(&priv->action_mutex); err = register_netdev(dev); if (err) { printk(KERN_WARNING DRV_NAME "Error calling register_netdev.\n"); - goto fail_unlock; + goto fail; } + + mutex_lock(&priv->action_mutex); registered = 1; IPW_DEBUG_INFO("%s: Bound to %s\n", dev->name, pci_name(pci_dev)); |