|
@@ -6442,6 +6442,7 @@ static int ipw2100_resume(struct pci_dev *pci_dev)
|
|
|
if (err) {
|
|
|
printk(KERN_ERR "%s: pci_enable_device failed on resume\n",
|
|
|
dev->name);
|
|
|
+ mutex_unlock(&priv->action_mutex);
|
|
|
return err;
|
|
|
}
|
|
|
pci_restore_state(pci_dev);
|
|
@@ -7146,7 +7147,7 @@ static int ipw2100_wx_get_rate(struct net_device *dev,
|
|
|
err = ipw2100_get_ordinal(priv, IPW_ORD_CURRENT_TX_RATE, &val, &len);
|
|
|
if (err) {
|
|
|
IPW_DEBUG_WX("failed querying ordinals.\n");
|
|
|
- return err;
|
|
|
+ goto done;
|
|
|
}
|
|
|
|
|
|
switch (val & TX_RATE_MASK) {
|