Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 301035
b: refs/heads/master
c: 1e66eda
h: refs/heads/master
i:
  301033: aac2e4a
  301031: 325da6c
v: v3
  • Loading branch information
Julia Lawall authored and John W. Linville committed Apr 17, 2012
1 parent 7dc85d2 commit 0be625b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: d9fb6465802c2279ea14cc26eb66d17c133478b1
refs/heads/master: 1e66eda1d40c9ce3ff38782da066a14e1b88ac50
6 changes: 4 additions & 2 deletions trunk/drivers/net/wireless/libertas/if_usb.c
Original file line number Diff line number Diff line change
Expand Up @@ -1128,8 +1128,10 @@ static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)

lbs_deb_enter(LBS_DEB_USB);

if (priv->psstate != PS_STATE_FULL_POWER)
return -1;
if (priv->psstate != PS_STATE_FULL_POWER) {
ret = -1;
goto out;
}

#ifdef CONFIG_OLPC
if (machine_is_olpc()) {
Expand Down

0 comments on commit 0be625b

Please sign in to comment.