diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-28 19:54:03 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-28 19:54:03 +0100 |
| commit | 9ebea3829fac7505e0cd2642fbd13cfa9c038831 (patch) | |
| tree | ed690568a27b7231b8a507e8ba07c1ae34868e5c /drivers/net/wireless/mwifiex/pcie.c | |
| parent | ath9k_hw: remove a useless WARN_ON (diff) | |
| parent | mwifiex: fix typo in PCIe adapter NULL check (diff) | |
| download | linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.tar.xz linux-9ebea3829fac7505e0cd2642fbd13cfa9c038831.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Conflicts:
drivers/net/wireless/ath/ath9k/main.c
drivers/net/wireless/iwlwifi/dvm/tx.c
Diffstat (limited to 'drivers/net/wireless/mwifiex/pcie.c')
| -rw-r--r-- | drivers/net/wireless/mwifiex/pcie.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/mwifiex/pcie.c b/drivers/net/wireless/mwifiex/pcie.c index 3da89b456c13..237949c070cc 100644 --- a/drivers/net/wireless/mwifiex/pcie.c +++ b/drivers/net/wireless/mwifiex/pcie.c @@ -164,7 +164,7 @@ static int mwifiex_pcie_suspend(struct pci_dev *pdev, pm_message_t state) if (pdev) { card = (struct pcie_service_card *) pci_get_drvdata(pdev); - if (!card || card->adapter) { + if (!card || !card->adapter) { pr_err("Card or adapter structure is not valid\n"); return 0; } |