diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 15:41:58 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-04-08 15:41:58 -0700 |
commit | 636c8a8d85d0564222071f0caa4a4e6bf527efe5 (patch) | |
tree | f1958f80f596cfcf496904f12a62662fa79ce990 /arch/s390/pci/pci_clp.c | |
parent | Merge tag 'fixes-for-v4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus (diff) | |
parent | USB: option: add "D-Link DWM-221 B1" device id (diff) | |
download | linux-dev-636c8a8d85d0564222071f0caa4a4e6bf527efe5.tar.xz linux-dev-636c8a8d85d0564222071f0caa4a4e6bf527efe5.zip |
Merge tag 'usb-serial-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial into usb-linus
Johan writes:
USB-serial fixes for v4.6-rc3
Here are some new device ids.
Signed-off-by: Johan Hovold <johan@kernel.org>
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); |