Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 368382
b: refs/heads/master
c: 8509e82
h: refs/heads/master
v: v3
  • Loading branch information
Bing Zhao authored and John W. Linville committed Mar 6, 2013
1 parent 909e139 commit d50ae09
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: fcca8d5ae5991a3ef18d9eceeb6e22caad36ab7d
refs/heads/master: 8509e82064319d175192837355a92653e1517798
2 changes: 2 additions & 0 deletions trunk/drivers/net/wireless/mwifiex/pcie.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ static bool mwifiex_pcie_ok_to_access_hw(struct mwifiex_adapter *adapter)
return false;
}

#ifdef CONFIG_PM
/*
* Kernel needs to suspend all functions separately. Therefore all
* registered functions must have drivers with suspend and resume
Expand Down Expand Up @@ -149,6 +150,7 @@ static int mwifiex_pcie_resume(struct pci_dev *pdev)

return 0;
}
#endif

/*
* This function probes an mwifiex device and registers it. It allocates
Expand Down

0 comments on commit d50ae09

Please sign in to comment.