diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-16 14:48:40 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-16 14:48:40 -0400 |
| commit | 24de851b79a414f0e1813eb131a7d90849cc22c2 (patch) | |
| tree | 4da554a6d83adbfea3e00e242f97028a69cc0bb7 /drivers/net/wireless/iwlwifi/pcie/drv.c | |
| parent | d0746663667f37e7be5646bf68cb452c8375a23d (diff) | |
| parent | 89716344806bd49d213ad5960661e8c2d38c4982 (diff) | |
| download | op-kernel-dev-24de851b79a414f0e1813eb131a7d90849cc22c2.zip op-kernel-dev-24de851b79a414f0e1813eb131a7d90849cc22c2.tar.gz | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/pcie/drv.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/pcie/drv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/pcie/drv.c b/drivers/net/wireless/iwlwifi/pcie/drv.c index 158669e..dc02cb9 100644 --- a/drivers/net/wireless/iwlwifi/pcie/drv.c +++ b/drivers/net/wireless/iwlwifi/pcie/drv.c @@ -325,15 +325,15 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) int ret; iwl_trans = iwl_trans_pcie_alloc(pdev, ent, cfg); - if (iwl_trans == NULL) - return -ENOMEM; + if (IS_ERR(iwl_trans)) + return PTR_ERR(iwl_trans); pci_set_drvdata(pdev, iwl_trans); trans_pcie = IWL_TRANS_GET_PCIE_TRANS(iwl_trans); trans_pcie->drv = iwl_drv_start(iwl_trans, cfg); - if (IS_ERR_OR_NULL(trans_pcie->drv)) { + if (IS_ERR(trans_pcie->drv)) { ret = PTR_ERR(trans_pcie->drv); goto out_free_trans; } |
