diff options
| author | Luca Coelho <luciano.coelho@intel.com> | 2016-05-10 10:30:56 +0300 |
|---|---|---|
| committer | Luca Coelho <luciano.coelho@intel.com> | 2016-05-10 10:30:56 +0300 |
| commit | bae6692c24236d0203f88a444986d86437a858fa (patch) | |
| tree | 0f9bee1250af3046fa46049736b615b81e60f56e /arch/s390/pci/pci_clp.c | |
| parent | 46167a8fd4248533ad15867e6988ff20e76de641 (diff) | |
| parent | 57fbcce37be7c1d2622b56587c10ade00e96afa3 (diff) | |
Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next into master
To synchronize with Kalle, here's just a big change that affects
all drivers - removing the duplicated enum ieee80211_band and
replacing it by enum nl80211_band. On top of that, just a small
documentation update.
Diffstat (limited to 'arch/s390/pci/pci_clp.c')
| -rw-r--r-- | arch/s390/pci/pci_clp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c index 21591ddb4c1f..1a4512c8544a 100644 --- a/arch/s390/pci/pci_clp.c +++ b/arch/s390/pci/pci_clp.c @@ -176,8 +176,7 @@ static int clp_query_pci_fn(struct zpci_dev *zdev, u32 fh) rc = clp_store_query_pci_fn(zdev, &rrb->response); if (rc) goto out; - if (rrb->response.pfgid) - rc = clp_query_pci_fngrp(zdev, rrb->response.pfgid); + rc = clp_query_pci_fngrp(zdev, rrb->response.pfgid); } else { zpci_err("Q PCI FN:\n"); zpci_err_clp(rrb->response.hdr.rsp, rc); |