Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 107102
b: refs/heads/master
c: 80c42af
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and John W. Linville committed Jul 29, 2008
1 parent e98f92f commit ba7d8a1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 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: e7087a828f8714e464fff18d93618727530dfd89
refs/heads/master: 80c42affad970c8ebc5ebec4681aef8dadf21c32
3 changes: 2 additions & 1 deletion trunk/drivers/net/wireless/ipw2100.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit ba7d8a1

Please sign in to comment.